Skip to content

Commit

Permalink
mac80211: correct skb allocation
Browse files Browse the repository at this point in the history
This patch corrects the allocation of skb in ADDBA req/resp and DELBA
it removes redundant space u.addba_* are already counted in sizeof(*mgmt)

Signed-off-by: Ester Kummer <ester.kummer@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ester Kummer authored and John W. Linville committed May 7, 2008
1 parent 079a253 commit 3acea5b
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions net/mac80211/mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -1093,8 +1093,8 @@ static void ieee80211_send_addba_resp(struct net_device *dev, u8 *da, u16 tid,
struct ieee80211_mgmt *mgmt;
u16 capab;

skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom + 1 +
sizeof(mgmt->u.action.u.addba_resp));
skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom);

if (!skb) {
printk(KERN_DEBUG "%s: failed to allocate buffer "
"for addba resp frame\n", dev->name);
Expand Down Expand Up @@ -1142,9 +1142,7 @@ void ieee80211_send_addba_request(struct net_device *dev, const u8 *da,
struct ieee80211_mgmt *mgmt;
u16 capab;

skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom + 1 +
sizeof(mgmt->u.action.u.addba_req));

skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom);

if (!skb) {
printk(KERN_ERR "%s: failed to allocate buffer "
Expand Down Expand Up @@ -1406,8 +1404,7 @@ void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid,
struct ieee80211_mgmt *mgmt;
u16 params;

skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom + 1 +
sizeof(mgmt->u.action.u.delba));
skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom);

if (!skb) {
printk(KERN_ERR "%s: failed to allocate buffer "
Expand Down

0 comments on commit 3acea5b

Please sign in to comment.