projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] nfsd4_lock() returns bogus values to clients
[powerpc.git]
/
net
/
bridge
/
br_input.c
diff --git
a/net/bridge/br_input.c
b/net/bridge/br_input.c
index
8f5f2e7
..
e3a73ce
100644
(file)
--- a/
net/bridge/br_input.c
+++ b/
net/bridge/br_input.c
@@
-23,11
+23,7
@@
const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
static int br_pass_frame_up_finish(struct sk_buff *skb)
{
static int br_pass_frame_up_finish(struct sk_buff *skb)
{
-#ifdef CONFIG_NETFILTER_DEBUG
- skb->nf_debug = 0;
-#endif
netif_receive_skb(skb);
netif_receive_skb(skb);
-
return 0;
}
return 0;
}
@@
-57,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);
/* 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;
if (br->dev->flags & IFF_PROMISC) {
struct sk_buff *skb2;
@@
-67,7
+68,7
@@
int br_handle_frame_finish(struct sk_buff *skb)
}
}
}
}
- if (
dest[0] & 1
) {
+ if (
is_multicast_ether_addr(dest)
) {
br_flood_forward(br, skb, !passedup);
if (!passedup)
br_pass_frame_up(br, skb);
br_flood_forward(br, skb, !passedup);
if (!passedup)
br_pass_frame_up(br, skb);
@@
-111,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 (!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)) {
if (p->br->stp_enabled &&
!memcmp(dest, bridge_ula, 5) &&
!(dest[5] & 0xF0)) {
@@
-122,9
+120,10
@@
int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
NULL, br_stp_handle_bpdu);
return 1;
}
NULL, br_stp_handle_bpdu);
return 1;
}
+ goto err;
}
}
-
else if (p->state == BR_STATE_FORWARD
ING) {
+
if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARN
ING) {
if (br_should_route_hook) {
if (br_should_route_hook(pskb))
return 0;
if (br_should_route_hook) {
if (br_should_route_hook(pskb))
return 0;
@@
-132,7
+131,7
@@
int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
dest = eth_hdr(skb)->h_dest;
}
dest = eth_hdr(skb)->h_dest;
}
- if (!
memcmp(p->br->dev->dev_addr, dest, ETH_ALEN
))
+ if (!
compare_ether_addr(p->br->dev->dev_addr, dest
))
skb->pkt_type = PACKET_HOST;
NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
skb->pkt_type = PACKET_HOST;
NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,