diff options
| author | Javier Cardona <javier@cozybit.com> | 2010-03-29 11:00:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:26:32 -0700 |
| commit | 394c17d4076fe95d0033e6be390629c8fbb6ebdb (patch) | |
| tree | 9bab33eb748ef622753f77f1061e0dc4769b825c /include | |
| parent | 6c5ccedaebdde3f691f7e1057a50caddf7a72220 (diff) | |
| download | lwn-394c17d4076fe95d0033e6be390629c8fbb6ebdb.tar.gz lwn-394c17d4076fe95d0033e6be390629c8fbb6ebdb.zip | |
mac80211: Handle mesh action frames in ieee80211_rx_h_action
commit 1cb561f83793191cf86a2db3948d28f5f42df9ff upstream.
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>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 163c840437d6..047e449e9403 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1137,6 +1137,8 @@ enum ieee80211_category { WLAN_CATEGORY_SA_QUERY = 8, WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9, WLAN_CATEGORY_WMM = 17, + WLAN_CATEGORY_MESH_PLINK = 30, /* Pending ANA approval */ + WLAN_CATEGORY_MESH_PATH_SEL = 32, /* Pending ANA approval */ WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126, WLAN_CATEGORY_VENDOR_SPECIFIC = 127, }; |