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

Commit 1cb561f8 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Handle mesh action frames in ieee80211_rx_h_action 



This fixes the problem introduced in commit
84040805 which broke mesh peer link establishment.

changes:
v2 	Added missing break (Johannes)
v3 	Broke original patch into two (Johannes)

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Cc: stable@kernel.org
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent de0f60ea

net/mac80211/mesh.c

+0 −3
Original line number Diff line number Diff line
@@ -749,9 +749,6 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) 


	switch (fc & IEEE80211_FCTL_STYPE) {

	case IEEE80211_STYPE_ACTION:

		if (skb->len < IEEE80211_MIN_ACTION_SIZE)

			return RX_DROP_MONITOR;

		/* fall through */

	case IEEE80211_STYPE_PROBE_RESP:

	case IEEE80211_STYPE_BEACON:

		skb_queue_tail(&ifmsh->skb_queue, skb);

net/mac80211/rx.c

+5 −0
Original line number Diff line number Diff line
@@ -1973,6 +1973,11 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			goto handled;

		}

		break;

	case MESH_PLINK_CATEGORY:

	case MESH_PATH_SEL_CATEGORY:

		if (ieee80211_vif_is_mesh(&sdata->vif))

			return ieee80211_mesh_rx_mgmt(sdata, rx->skb);

		break;

	}



	/*