diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /net/bridge/br_input.c | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index b7766562d72c..b0b7f55c1edd 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -125,9 +125,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb) | |||
| 125 | struct sk_buff *skb = *pskb; | 125 | struct sk_buff *skb = *pskb; |
| 126 | const unsigned char *dest = eth_hdr(skb)->h_dest; | 126 | const unsigned char *dest = eth_hdr(skb)->h_dest; |
| 127 | 127 | ||
| 128 | if (p->state == BR_STATE_DISABLED) | ||
| 129 | goto err; | ||
| 130 | |||
| 131 | if (!is_valid_ether_addr(eth_hdr(skb)->h_source)) | 128 | if (!is_valid_ether_addr(eth_hdr(skb)->h_source)) |
| 132 | goto err; | 129 | goto err; |
| 133 | 130 | ||