diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-02-01 10:48:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-01 10:48:50 -0500 |
| commit | 874239f51f8759f3955630fa5da5cf13cd6567d5 (patch) | |
| tree | 224640a759c0734bc6d0bfd5fd207301b1ef4a10 /net/mac80211/mesh_plink.c | |
| parent | rtlwifi: Convert to asynchronous firmware load (diff) | |
| parent | iwlwifi: fix PCI-E transport "inta" race (diff) | |
| download | linux-dev-874239f51f8759f3955630fa5da5cf13cd6567d5.tar.xz linux-dev-874239f51f8759f3955630fa5da5cf13cd6567d5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index bf92e2878fe6..8806e5ef8ffe 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -172,7 +172,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, int hdr_len = offsetof(struct ieee80211_mgmt, u.action.u.self_prot) + sizeof(mgmt->u.action.u.self_prot); - skb = dev_alloc_skb(local->hw.extra_tx_headroom + + skb = dev_alloc_skb(local->tx_headroom + hdr_len + 2 + /* capability info */ 2 + /* AID */ @@ -186,7 +186,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, sdata->u.mesh.ie_len); if (!skb) return -1; - skb_reserve(skb, local->hw.extra_tx_headroom); + skb_reserve(skb, local->tx_headroom); mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len); memset(mgmt, 0, hdr_len); mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | |