From 6868e6487eabffcd967c1038d0f81c612fe24c01 Mon Sep 17 00:00:00 2001
From: nhorman <nhorman@tuxdriver.com>
Date: Wed, 14 Sep 2011 03:05:02 +0000
Subject: [PATCH] --- yaml --- r: 263900 b: refs/heads/master c:
 31dda0ae933bb9fea9cfe000b698c41af0417cac h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ethernet/eth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index caf0dce68aa7..2511a17a18e1 100644
--- 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
index 27997d35ebd3..a2468363978e 100644
--- 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);