From 49ec24db6f0e266560fa159addcaa624a2cd12ed Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Mon, 29 Mar 2010 11:00:20 -0700
Subject: [PATCH] --- yaml --- r: 189841 b: refs/heads/master c:
 1cb561f83793191cf86a2db3948d28f5f42df9ff h: refs/heads/master i:   189839:
 7640c8ee4148c6c3a69dfbd894827fd3acca9382 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mesh.c | 3 ---
 trunk/net/mac80211/rx.c   | 5 +++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 68465a8da199..400b3a71e13b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de0f60ea94e132c858caa64a44b2012e1e8580b0
+refs/heads/master: 1cb561f83793191cf86a2db3948d28f5f42df9ff
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index 61080c5fad50..7a6bebce7f2f 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -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);
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index b5c48de81d8b..13fcd2d17c6b 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/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;
 	}
 
 	/*