Merge branch 'bugzilla-13620-revert' into release

[karo-tx-linux.git] / net / bridge / br_stp_bpdu.c

diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 996476174517f5e7250287109ca81bafccff1df0..81ae40b3f6550c70b01b8d88a5266e14647a2d11 100644 (file)
--- 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 (dev_net(dev) != &init_net)
-               goto err;
-
        if (!p)
                goto err;