Browse Source

[BRIDGE]: don't change packet type

The change to forward STP bpdu's (for usermode STP) through normal path,
changed the packet type in the process. Since link local stuff is multicast, it
should stay pkt_type = PACKET_MULTICAST.  The code was probably copy/pasted
incorrectly from the bridge pseudo-device receive path.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stephen Hemminger 18 năm trước cách đây
mục cha
commit
83aa0938ff
1 tập tin đã thay đổi với 1 bổ sung4 xóa
  1. 1 4
      net/bridge/br_input.c

+ 1 - 4
net/bridge/br_input.c

@@ -131,12 +131,9 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
 		goto drop;
 		goto drop;
 
 
-	if (unlikely(is_link_local(dest))) {
-		skb->pkt_type = PACKET_HOST;
-
+	if (unlikely(is_link_local(dest)))
 		return (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
 		return (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
 				NULL, br_handle_local_finish) == 0) ? skb : NULL;
 				NULL, br_handle_local_finish) == 0) ? skb : NULL;
-	}
 
 
 	switch (p->state) {
 	switch (p->state) {
 	case BR_STATE_FORWARDING:
 	case BR_STATE_FORWARDING: