diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-03-07 20:54:29 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-25 14:42:41 +0100 |
| commit | c3ffeab4345830aadfc78444933754330f1339e7 (patch) | |
| tree | a7939d86dfd0e4fb4519fa6b15b7f6a6325becb3 /net/mac80211/tx.c | |
| parent | mac80211: ibss: disable beaconing before freeing beacon (diff) | |
| download | linux-dev-c3ffeab4345830aadfc78444933754330f1339e7.tar.xz linux-dev-c3ffeab4345830aadfc78444933754330f1339e7.zip | |
mac80211: ibss: use beacon_data struct for beacon and probe response
Instead of having an SKB all the time, use a beacon_data struct
with just the information required. This also allows removing a
synchronize_rcu() and using kfree_rcu() instead.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 2a6ae8030bd9..4a83d8dea840 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2442,14 +2442,17 @@ struct sk_buff *ieee80211_beacon_get_tim(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); + struct beacon_data *presp = rcu_dereference(ifibss->presp); if (!presp) goto out; - skb = skb_copy(presp, GFP_ATOMIC); + skb = dev_alloc_skb(local->tx_headroom + presp->head_len); if (!skb) goto out; + skb_reserve(skb, local->tx_headroom); + memcpy(skb_put(skb, presp->head_len), presp->head, + presp->head_len); hdr = (struct ieee80211_hdr *) skb->data; hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | |