diff options
| author |   Javier Cardona <javier@cozybit.com> | 2010-03-29 11:00:20 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-04-06 15:53:28 -0400 |
| commit | 1cb561f83793191cf86a2db3948d28f5f42df9ff (patch) | |
| tree | f1d8109a0ed6595e1fb6ef3e5b14b8194deb5215 /net/mac80211/rx.c | |
| parent | iwlwifi: avoid Tx queue memory allocation in interface down (diff) | |
| download | linux-dev-1cb561f83793191cf86a2db3948d28f5f42df9ff.tar.xz linux-dev-1cb561f83793191cf86a2db3948d28f5f42df9ff.zip | |
mac80211: Handle mesh action frames in ieee80211_rx_h_action
This fixes the problem introduced in commit
8404080568613d93ad7cf0a16dfb68 which broke mesh peer link establishment.
changes:
v2 Added missing break (Johannes)
v3 Broke original patch into two (Johannes)
Signed-off-by: Javier Cardona <javier@cozybit.com>
Cc: stable@kernel.org
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index b5c48de81d8b..13fcd2d17c6b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -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; } /* |