---

yaml --- r: 263900 b: refs/heads/master c: 31dda0a h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · 6868e64 · 6868e64
1 parent 0d1ff3b
commit 6868e64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48c830120f2a20b44220aa26feda9ed15f49eaab
+refs/heads/master: 31dda0ae933bb9fea9cfe000b698c41af0417cac
diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c
@@ -340,7 +340,7 @@ void ether_setup(struct net_device *dev)
 	dev->addr_len		= ETH_ALEN;
 	dev->tx_queue_len	= 1000;	/* Ethernet wants good queues */
 	dev->flags		= IFF_BROADCAST|IFF_MULTICAST;
-	dev->priv_flags		= IFF_TX_SKB_SHARING;
+	dev->priv_flags		|= IFF_TX_SKB_SHARING;
 
 	memset(dev->broadcast, 0xFF, ETH_ALEN);