aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2011-05-03 19:57:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-11 14:37:47 -0400
commitd3aaec8ab76c2d604c2ba7332e1338674607597b (patch)
tree436851aa4210a3567642945831854142b4fa9cf6 /net/mac80211/mesh.c
parent0778a6a3e56cabdc322755f97ad23ee67efad0f0 (diff)
mac80211: Drop MESH_PLINK category and use new ANA-approved MESH_ACTION
Note: This breaks compatibility with previous mesh protocol instances. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 2a59eb345131..75378e852f00 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -600,7 +600,7 @@ static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,
600 struct ieee80211_rx_status *rx_status) 600 struct ieee80211_rx_status *rx_status)
601{ 601{
602 switch (mgmt->u.action.category) { 602 switch (mgmt->u.action.category) {
603 case WLAN_CATEGORY_MESH_PLINK: 603 case WLAN_CATEGORY_MESH_ACTION:
604 mesh_rx_plink_frame(sdata, mgmt, len, rx_status); 604 mesh_rx_plink_frame(sdata, mgmt, len, rx_status);
605 break; 605 break;
606 case WLAN_CATEGORY_MESH_PATH_SEL: 606 case WLAN_CATEGORY_MESH_PATH_SEL: