bridge: Fix LRO crash with tun

[safe/jmp/linux-2.6] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 0a09ccf..727c5c5 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -373,7 +373,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
                return -EINVAL;
 
-       if (dev->hard_start_xmit == br_dev_xmit)
+       if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)
                return -ELOOP;
 
        if (dev->br_port != NULL)
@@ -460,7 +460,7 @@ void br_net_exit(struct net *net)
 restart:
        for_each_netdev(net, dev) {
                if (dev->priv_flags & IFF_EBRIDGE) {
-                       del_br(dev->priv);
+                       del_br(netdev_priv(dev));
                        goto restart;
                }
        }