From b5f17474ee59558a56ca381d5984920306f13036 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 10 Apr 2006 16:38:47 -0700
Subject: [PATCH] --- yaml --- r: 25671 b: refs/heads/master c:
 b7595b4955b5178e28906838cc3e8efa62d8caee h: refs/heads/master i:   25669:
 7d41aedd66b3a38e97b78f5775cf8ca08bfaf938   25667:
 7cfe2ff88e740725d84ece4d45b6e9baa1c138dd   25663:
 82f9aecc2f8887d02f8e44231a61f8fcad190395 v: v3

---
 [refs]                      | 2 +-
 trunk/net/bridge/br_input.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b85d15d63d2d..c80fc6fca951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6596f9d2b4f0255f6cd68c76b85fe4cec6352af
+refs/heads/master: b7595b4955b5178e28906838cc3e8efa62d8caee
diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c
index b7766562d72c..b0b7f55c1edd 100644
--- a/trunk/net/bridge/br_input.c
+++ b/trunk/net/bridge/br_input.c
@@ -125,9 +125,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
 	struct sk_buff *skb = *pskb;
 	const unsigned char *dest = eth_hdr(skb)->h_dest;
 
-	if (p->state == BR_STATE_DISABLED)
-		goto err;
-
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
 		goto err;