Thread (4 messages) 4 messages, 3 authors, 2011-09-15

Re: [PATCH] net: don't clear IFF_XMIT_DST_RELEASE in ether_setup

flat view

From: Neil Horman <nhorman@tuxdriver.com>
Date: 2011-09-14 14:57:31

On Wed, Sep 14, 2011 at 03:28:41PM +0200, Eric Dumazet wrote:
Le mercredi 14 septembre 2011 à 09:05 -0400, Neil Horman a écrit :
quoted
d88733150 introduced the IFF_SKB_TX_SHARING flag, which I unilaterally set in
ether_setup.  In doing this I didn't realize that other flags (such as
IFF_XMIT_DST_RELEASE) might be set prior to calling the ether_setup routine.
This patch changes ether_setup to or in SKB_TX_SHARING so as not to
inadvertently clear other existing flags.  Thanks to Pekka Riikonen for pointing
out my error

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Pekka Riikonen <redacted>
CC: "David S. Miller" <davem@davemloft.net>
---
 net/ethernet/eth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 27997d3..a246836 100644
--- a/net/ethernet/eth.c
+++ b/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);
 
I CC Pekka Riikonen [off-list ref], not sure if he is netdev
subscribded.
Thank you Eric, I didn't check and assumed my config CC'ed Reported-by: emails
Neil
Acked-by: Eric Dumazet <redacted>



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help