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

Commit 2154c81c authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Mesh data frames must have the QoS header 



Per sec 7.1.3.5 of draft 12.0 of 802.11s, mesh frames indicate the
presence of the mesh control header in their QoS header.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4777be41

include/linux/ieee80211.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ 
#define IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK	0x0060

/* A-MSDU 802.11n */

#define IEEE80211_QOS_CTL_A_MSDU_PRESENT	0x0080

/* Mesh Control 802.11s */

#define IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT  0x0100



/* U-APSD queue for WMM IEs sent by AP */

#define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD	(1<<7)

net/mac80211/mesh.c

+1 −2
Original line number Diff line number Diff line
@@ -463,8 +463,7 @@ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, 
		memcpy(hdr->addr3, meshsa, ETH_ALEN);

		return 24;

	} else {

		*fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS |

				IEEE80211_FCTL_TODS);

		*fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS);

		/* RA TA DA SA */

		memset(hdr->addr1, 0, ETH_ALEN);   /* RA is resolved later */

		memcpy(hdr->addr2, meshsa, ETH_ALEN);

net/mac80211/mesh_hwmp.c

+1 −2
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags, 
static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata,

		struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	skb_set_mac_header(skb, 0);
@@ -221,7 +220,7 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata, 
	skb->priority = 7;



	info->control.vif = &sdata->vif;

	ieee80211_set_qos_hdr(local, skb);

	ieee80211_set_qos_hdr(sdata, skb);

}



/**

net/mac80211/mesh_pathtbl.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta) 
		hdr = (struct ieee80211_hdr *) skb->data;

		memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);

		skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb));

		ieee80211_set_qos_hdr(sdata->local, skb);

		ieee80211_set_qos_hdr(sdata, skb);

		__skb_queue_tail(&tmpq, skb);

	}

net/mac80211/rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1910,7 +1910,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
								fwded_mcast);

				skb_set_queue_mapping(fwd_skb,

					ieee80211_select_queue(sdata, fwd_skb));

				ieee80211_set_qos_hdr(local, fwd_skb);

				ieee80211_set_qos_hdr(sdata, fwd_skb);

			} else {

				int err;

				/*
@@ -2572,12 +2572,12 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx) 
		CALL_RXH(ieee80211_rx_h_ps_poll)

		CALL_RXH(ieee80211_rx_h_michael_mic_verify)

		/* must be after MMIC verify so header is counted in MPDU mic */

		CALL_RXH(ieee80211_rx_h_remove_qos_control)

		CALL_RXH(ieee80211_rx_h_amsdu)

#ifdef CONFIG_MAC80211_MESH

		if (ieee80211_vif_is_mesh(&rx->sdata->vif))

			CALL_RXH(ieee80211_rx_h_mesh_fwding);

#endif

		CALL_RXH(ieee80211_rx_h_remove_qos_control)

		CALL_RXH(ieee80211_rx_h_amsdu)

		CALL_RXH(ieee80211_rx_h_data)

		CALL_RXH(ieee80211_rx_h_ctrl);

		CALL_RXH(ieee80211_rx_h_mgmt_check)