Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 7 insertions, 4 deletions

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index b88220a64cd8..c387852f753a 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -53,6 +53,11 @@ int br_handle_frame_finish(struct sk_buff *skb)
         /* insert into forwarding database after filtering to avoid spoofing */
         br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
 
+        if (p->state == BR_STATE_LEARNING) {
+                kfree_skb(skb);
+                goto out;
+        }
+
         if (br->dev->flags & IFF_PROMISC) {
                 struct sk_buff *skb2;
 
@@ -107,9 +112,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
         if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                 goto err;
 
-        if (p->state == BR_STATE_LEARNING)
-                br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
         if (p->br->stp_enabled &&
             !memcmp(dest, bridge_ula, 5) &&
             !(dest[5] & 0xF0)) {
@@ -118,9 +120,10 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
                                 NULL, br_stp_handle_bpdu);
                         return 1;
                 }
+                goto err;
         }
 
-        else if (p->state == BR_STATE_FORWARDING) {
+        if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARNING) {
                 if (br_should_route_hook) {
                         if (br_should_route_hook(pskb)) 
                                 return 0;