Merge Linux 2.6.23

1 files changed, 5 insertions, 0 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 69b70977f000..eb57502bb264 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
         if (hold_time(br) == 0)
                 return;
 
+        /* ignore packets unless we are using this port */
+        if (!(source->state == BR_STATE_LEARNING ||
+              source->state == BR_STATE_FORWARDING))
+                return;
+
         fdb = fdb_find(head, addr);
         if (likely(fdb)) {
                 /* attempt to update an entry for a local interface */