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

Commit 65e8b0cc authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Use the right headroom size for mesh mgmt frames 



Use local->tx_headroom instad of local->hw.extra_tx_headroom.
local->tx_headroom is the max of hw.extra_tx_headroom required by the
driver and the headroom required by mac80211 for status reporting.  On
drivers where hw.extra_tx_headroom is smaller than what mac80211
requires (e.g. ath5k), we would not reserve sufficient buffer space to
report tx status.

Also, don't reserve local->tx_headroom + local->hw.extra_tx_headroom.

Reported-by: default avatarSimon Morgenthaler <s.morgenthaler@students.unibe.ch>
Reported-by: default avatarKai Scharwies <kai@scharwies.de>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f96b08a7

net/mac80211/mesh_hwmp.c

+4 −4
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags, 
	int hdr_len = offsetof(struct ieee80211_mgmt, u.action.u.mesh_action) +

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



	skb = dev_alloc_skb(local->hw.extra_tx_headroom +

	skb = dev_alloc_skb(local->tx_headroom +

			    hdr_len +

			    2 + 37); /* max HWMP IE */

	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 |
@@ -250,12 +250,12 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, 
	if (time_before(jiffies, ifmsh->next_perr))

		return -EAGAIN;



	skb = dev_alloc_skb(local->hw.extra_tx_headroom +

	skb = dev_alloc_skb(local->tx_headroom +

			    hdr_len +

			    2 + 15 /* PERR IE */);

	if (!skb)

		return -1;

	skb_reserve(skb, local->tx_headroom + 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 |

net/mac80211/mesh_plink.c

+2 −2
Original line number Diff line number Diff line
@@ -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 |