Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux

[linux-2.6-block.git] / drivers / net / ifb.c

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index d2d4a3d2237f7c735a326a949ec55561fe0c79f7..34f846b4bd0574a8168d669c408181e1086d3386 100644 (file)
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -185,7 +185,8 @@ static void ifb_setup(struct net_device *dev)
 
        dev->flags |= IFF_NOARP;
        dev->flags &= ~IFF_MULTICAST;
-       dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
+       dev->priv_flags &= ~IFF_TX_SKB_SHARING;
+       netif_keep_dst(dev);
        eth_hw_addr_random(dev);
 }