net: don't clear IFF_XMIT_DST_RELEASE in ether_setup
authornhorman <nhorman@tuxdriver.com>
Wed, 14 Sep 2011 03:05:02 +0000 (03:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Sep 2011 18:49:44 +0000 (14:49 -0400)
commit31dda0ae933bb9fea9cfe000b698c41af0417cac
treecaa4e6bf6a2439bb45716e6b1f2e97b56e06fd00
parent48c830120f2a20b44220aa26feda9ed15f49eaab
net: don't clear IFF_XMIT_DST_RELEASE in ether_setup

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 <priikone@iki.fi>
CC: "David S. Miller" <davem@davemloft.net>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ethernet/eth.c