diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-11-02 19:18:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-02 19:18:50 -0800 |
| commit | bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b (patch) | |
| tree | d1a13eedc08cdc07aa488e77af08b84c50a07c46 /net/mac80211/ibss.c | |
| parent | gre: Fix dev_addr clobbering for gretap (diff) | |
| parent | mac80211: check interface is down before type change (diff) | |
| download | linux-dev-bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b.tar.xz linux-dev-bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index ca8ecce31d34..f1362f32c17d 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -73,6 +73,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt; u8 *pos; struct ieee80211_supported_band *sband; + struct cfg80211_bss *bss; u32 bss_change; u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; @@ -177,8 +178,9 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, mod_timer(&ifibss->timer, round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL)); - cfg80211_inform_bss_frame(local->hw.wiphy, local->hw.conf.channel, - mgmt, skb->len, 0, GFP_KERNEL); + bss = cfg80211_inform_bss_frame(local->hw.wiphy, local->hw.conf.channel, + mgmt, skb->len, 0, GFP_KERNEL); + cfg80211_put_bss(bss); cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL); } |