Re: [PATCH v2 1/4] brcm80211: fix compile issue

Re: [PATCH v2 1/4] brcm80211: fix compile issue

[Henry Ptasinski]

On 02/15/2011 02:12 PM, Stanislav Fomichev wrote:
> Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j"
> changed the definition of the ieee80211_channel_to_frequency; so fix its
> usage in brcmfmac.
>

Commit 59eb21a65047 went into wireless-next a few weeks ago, but hasn't 
made it over to staging-next yet.  Should John pick up this patch for 
wireless-next now, and it'll eventually migrate over to staging-next?

- Henry

Re: [PATCH v2 1/4] brcm80211: fix compile issue

[John W. Linville]

On Tue, Feb 15, 2011 at 02:37:40PM -0800, Henry Ptasinski wrote:
> On 02/15/2011 02:12 PM, Stanislav Fomichev wrote:
> >Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j"
> >changed the definition of the ieee80211_channel_to_frequency; so fix its
> >usage in brcmfmac.
> >
> 
> Commit 59eb21a65047 went into wireless-next a few weeks ago, but
> hasn't made it over to staging-next yet.  Should John pick up this
> patch for wireless-next now, and it'll eventually migrate over to
> staging-next?

If so, not only let me know but also resend a copy to me -- I haven't
been tracking these...

John
-- 
John W. Linville                Someday the world will need a hero, and you
linville@tuxdriver.com                  might be all we have.  Be ready.

Re: [PATCH v2 1/4] brcm80211: fix compile issue

[Henry Ptasinski]

On 02/15/2011 05:50 PM, John W. Linville wrote:
> On Tue, Feb 15, 2011 at 02:37:40PM -0800, Henry Ptasinski wrote:
>> On 02/15/2011 02:12 PM, Stanislav Fomichev wrote:
>>> Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j"
>>> changed the definition of the ieee80211_channel_to_frequency; so fix its
>>> usage in brcmfmac.
>>>
>>
>> Commit 59eb21a65047 went into wireless-next a few weeks ago, but
>> hasn't made it over to staging-next yet.  Should John pick up this
>> patch for wireless-next now, and it'll eventually migrate over to
>> staging-next?
>
> If so, not only let me know but also resend a copy to me -- I haven't
> been tracking these...


Greg, any opinions?  See any issues with making minimally-required 
changes over in wireless-next to track mac80211 API changes that you 
haven't picked up yet?

Thanks,
- Henry

Re: [PATCH v2 1/4] brcm80211: fix compile issue

[Greg KH]

On Thu, Feb 17, 2011 at 06:46:18PM -0800, Henry Ptasinski wrote:
> On 02/15/2011 05:50 PM, John W. Linville wrote:
> >On Tue, Feb 15, 2011 at 02:37:40PM -0800, Henry Ptasinski wrote:
> >>On 02/15/2011 02:12 PM, Stanislav Fomichev wrote:
> >>>Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j"
> >>>changed the definition of the ieee80211_channel_to_frequency; so fix its
> >>>usage in brcmfmac.
> >>>
> >>
> >>Commit 59eb21a65047 went into wireless-next a few weeks ago, but
> >>hasn't made it over to staging-next yet.  Should John pick up this
> >>patch for wireless-next now, and it'll eventually migrate over to
> >>staging-next?
> >
> >If so, not only let me know but also resend a copy to me -- I haven't
> >been tracking these...
> 
> 
> Greg, any opinions?  See any issues with making minimally-required
> changes over in wireless-next to track mac80211 API changes that you
> haven't picked up yet?

No objection from me.

thanks,

greg k-h

Subject: [PATCH v3] wireless-next-2.6: brcm80211: fix compile issue

[Henry Ptasinski]

For wireless-next-2.6:

Commit 59eb21a65047 "cfg80211: Extend channel to frequency mapping for 802.11j"
changed the definition of the ieee80211_channel_to_frequency; so fix its
usage in brcmfmac.

Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
---
 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 991463f..9b7b71c 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2313,7 +2313,9 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
 	notif_bss_info->frame_len =
 	    offsetof(struct ieee80211_mgmt,
 		     u.beacon.variable) + wl_get_ielen(wl);
-	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+					      band->band);
+
 	channel = ieee80211_get_channel(wiphy, freq);
 
 	WL_DBG("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
-- 
1.7.1