diff options
| author | Johannes Berg | 2009-04-19 21:25:43 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-04-22 22:57:17 +0200 |
| commit | af8cdcd828ad751fae8e6cbfe94eef9f2f23b14b (patch) | |
| tree | 7a00a19c976abbeba16bd04ddc177b6332057c98 /net/mac80211/tx.c | |
| parent | cfg80211/nl80211: add IBSS API (diff) | |
| download | kernel-qcow2-linux-af8cdcd828ad751fae8e6cbfe94eef9f2f23b14b.tar.gz kernel-qcow2-linux-af8cdcd828ad751fae8e6cbfe94eef9f2f23b14b.tar.xz kernel-qcow2-linux-af8cdcd828ad751fae8e6cbfe94eef9f2f23b14b.zip | |
mac80211: convert to cfg80211 IBSS API
This converts mac80211 to the new cfg80211 IBSS API, the
wext handling functions are called where appropriate.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f336cc731df6..c53d77db3e4f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2102,18 +2102,18 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct ieee80211_hdr *hdr; + struct sk_buff *presp = rcu_dereference(ifibss->presp); - if (!ifibss->probe_resp) + if (!presp) goto out; - skb = skb_copy(ifibss->probe_resp, GFP_ATOMIC); + skb = skb_copy(presp, GFP_ATOMIC); if (!skb) goto out; hdr = (struct ieee80211_hdr *) skb->data; hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON); - } else if (ieee80211_vif_is_mesh(&sdata->vif)) { struct ieee80211_mgmt *mgmt; u8 *pos; |