summaryrefslogtreecommitdiff
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-08-17 12:09:53 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-08-17 12:09:53 -0400
commit044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch)
tree9252cd09defdd29742af6b2bd22db72ce252ab1a /drivers/net/tun.c
parentaf7a950284af5526a26b4ae4809c1104b4dc47f3 (diff)
parentc5624f554600ab812fe235690665ee81413cebc3 (diff)
Merge commit 'v3.0.2' into linaro-3.0
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 5235f48be1b..fb50e5a542f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -528,6 +528,7 @@ static void tun_net_init(struct net_device *dev)
dev->netdev_ops = &tap_netdev_ops;
/* Ethernet TAP Device */
ether_setup(dev);
+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;
random_ether_addr(dev->dev_addr);