From 3e56ca8f73c959b37b027bba551e4d592cd28ced Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 12 Jul 2011 22:26:33 -0500
Subject: [PATCH] --- yaml --- r: 267666 b: refs/heads/master c:
 4ebba6d6e34796bdc5ead494111fb19c619eb599 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_softmac.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e5adae2344b6..a030a70fe684 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e94b0bbbc247049da6e7bd5b3299e7c78df748d
+refs/heads/master: 4ebba6d6e34796bdc5ead494111fb19c619eb599
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
index a3a0397e10ff..281d51bdc54e 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2561,11 +2561,6 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, struct sk_buff *s
 		case RTLLIB_STYPE_MANAGE_ACT:
 			rtllib_process_action(ieee,skb);
 			break;
-#ifdef COMPATIBLE_WITH_RALINK_MESH
-		case RTLLIB_STYPE_MESH_ACT:
-			rtllib_process_action_mesh(ieee,skb,rx_stats);
-			break;
-#endif
 		default:
 			return -1;
 			break;