Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acea5b6 authored by Ester Kummer's avatar Ester Kummer Committed by John W. Linville
Browse files

mac80211: correct skb allocation 



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: default avatarEster Kummer <ester.kummer@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 079a2533

net/mac80211/mlme.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -1093,8 +1093,8 @@ static void ieee80211_send_addba_resp(struct net_device *dev, u8 *da, u16 tid, 
	struct ieee80211_mgmt *mgmt;

	struct ieee80211_mgmt *mgmt;

	u16 capab;

	u16 capab;





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

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

					sizeof(mgmt->u.action.u.addba_resp));



	if (!skb) {

	if (!skb) {

		printk(KERN_DEBUG "%s: failed to allocate buffer "

		printk(KERN_DEBUG "%s: failed to allocate buffer "

		       "for addba resp frame\n", dev->name);

		       "for addba resp frame\n", dev->name);
@@ -1142,9 +1142,7 @@ void ieee80211_send_addba_request(struct net_device *dev, const u8 *da, 
	struct ieee80211_mgmt *mgmt;

	struct ieee80211_mgmt *mgmt;

	u16 capab;

	u16 capab;





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

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

				sizeof(mgmt->u.action.u.addba_req));







	if (!skb) {

	if (!skb) {

		printk(KERN_ERR "%s: failed to allocate buffer "

		printk(KERN_ERR "%s: failed to allocate buffer "
@@ -1406,8 +1404,7 @@ void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid, 
	struct ieee80211_mgmt *mgmt;

	struct ieee80211_mgmt *mgmt;

	u16 params;

	u16 params;





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

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

					sizeof(mgmt->u.action.u.delba));





	if (!skb) {

	if (!skb) {

		printk(KERN_ERR "%s: failed to allocate buffer "

		printk(KERN_ERR "%s: failed to allocate buffer "