Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / net / bridge / br_stp_bpdu.c

diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 0edbd2a1c3f3cafe6d2046360f92b5a9084235f3..8deab645ef757d5f415e91f7ef1e07b81c3738b0 100644 (file)
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -142,7 +142,7 @@ int br_stp_rcv(struct sk_buff *skb, struct net_device *dev,
        struct net_bridge *br;
        const unsigned char *buf;
 
-       if (dev->nd_net != &init_net)
+       if (dev_net(dev) != &init_net)
                goto err;
 
        if (!p)