patch-2.4.0-test3 linux/net/bridge/br_input.c

Next file: linux/net/core/neighbour.c
Previous file: linux/net/ax25/ax25_route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/net/bridge/br_input.c linux/net/bridge/br_input.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_input.c,v 1.5 2000/03/30 01:22:23 davem Exp $
+ *	$Id: br_input.c,v 1.6 2000/06/26 18:09:17 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -80,7 +80,9 @@
 		}
 	}
 
-	if (!memcmp(dest, bridge_ula, 5) && !(dest[5] & 0xF0))
+	if (br->stp_enabled &&
+	    !memcmp(dest, bridge_ula, 5) &&
+	    !(dest[5] & 0xF0))
 		goto handle_special_frame;
 
 	if (p->state == BR_STATE_LEARNING ||

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)