patch-2.3.99-pre3 linux/net/bridge/br_input.c

• Lines: 36
• Date: Tue Mar 21 23:38:26 2000
• Orig file: v2.3.99-pre2/linux/net/bridge/br_input.c
• Orig date: Sat Feb 26 22:32:08 2000

diff -u --recursive --new-file v2.3.99-pre2/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.3 2000/02/24 19:48:06 davem Exp $
+ *	$Id: br_input.c,v 1.4 2000/03/21 21:08:47 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
 #include <linux/if_bridge.h>
 #include "br_private.h"
 
-unsigned char bridge_ula[5] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
+unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
 static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
 {
@@ -53,6 +53,8 @@
 	    p->state == BR_STATE_DISABLED)
 		goto freeandout;
 
+	skb_push(skb, skb->data - skb->mac.raw);
+
 	if (br->dev.flags & IFF_PROMISC) {
 		struct sk_buff *skb2;
 
@@ -80,8 +82,6 @@
 
 	if (!memcmp(dest, bridge_ula, 5) && !(dest[5] & 0xF0))
 		goto handle_special_frame;
-
-	skb_push(skb, skb->data - skb->mac.raw);
 
 	if (p->state == BR_STATE_LEARNING ||
 	    p->state == BR_STATE_FORWARDING)