diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:51:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:51:32 +0200 |
| commit | 5fef06e8c8c52aa7170dbbb068aa996d83738d38 (patch) | |
| tree | f46a1eefd68863bdae57afa004e5281801a6b61e /net/bridge/br_stp_bpdu.c | |
| parent | 0c5d1eb77a8be917b638344a22afe1398236482b (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
Merge branch 'linus' into genirq
Diffstat (limited to 'net/bridge/br_stp_bpdu.c')
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 8b200f96f72..81ae40b3f65 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -140,9 +140,6 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_bridge *br; const unsigned char *buf; - if (!net_eq(dev_net(dev), &init_net)) - goto err; - if (!p) goto err; |