Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 550fd08c authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared 



After the last patch, We are left in a state in which only drivers calling
ether_setup have IFF_TX_SKB_SHARING set (we assume that drivers touching real
hardware call ether_setup for their net_devices and don't hold any state in
their skbs.  There are a handful of drivers that violate this assumption of
course, and need to be fixed up.  This patch identifies those drivers, and marks
them as not being able to support the safe transmission of skbs by clearning the
IFF_TX_SKB_SHARING flag in priv_flags

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: Karsten Keil <isdn@linux-pingi.de>
CC: "David S. Miller" <davem@davemloft.net>
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: Patrick McHardy <kaber@trash.net>
CC: Krzysztof Halasa <khc@pm.waw.pl>
CC: "John W. Linville" <linville@tuxdriver.com>
CC: Greg Kroah-Hartman <gregkh@suse.de>
CC: Marcel Holtmann <marcel@holtmann.org>
CC: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8873315

drivers/isdn/i4l/isdn_net.c

+3 −0
Original line number Diff line number Diff line
@@ -2532,6 +2532,9 @@ static void _isdn_setup(struct net_device *dev) 


	/* Setup the generic properties */

	dev->flags = IFF_NOARP|IFF_POINTOPOINT;



	/* isdn prepends a header in the tx path, can't share skbs */

	dev->priv_flags &= ~IFF_TX_SKB_SHARING;

	dev->header_ops = NULL;

	dev->netdev_ops = &isdn_netdev_ops;

drivers/net/bonding/bond_main.c

+4 −2
Original line number Diff line number Diff line
@@ -1557,8 +1557,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 


			if (slave_dev->type != ARPHRD_ETHER)

				bond_setup_by_slave(bond_dev, slave_dev);

			else

			else {

				ether_setup(bond_dev);

				bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

			}



			netdev_bonding_change(bond_dev,

					      NETDEV_POST_TYPE_CHANGE);
@@ -4330,7 +4332,7 @@ static void bond_setup(struct net_device *bond_dev) 
	bond_dev->tx_queue_len = 0;

	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;

	bond_dev->priv_flags |= IFF_BONDING;

	bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;

	bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);



	/* At first, we block adding VLANs. That's the only way to

	 * prevent problems that occur when adding VLANs over an

drivers/net/ifb.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void ifb_setup(struct net_device *dev) 


	dev->flags |= IFF_NOARP;

	dev->flags &= ~IFF_MULTICAST;

	dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;

	dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);

	random_ether_addr(dev->dev_addr);

}

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void macvlan_common_setup(struct net_device *dev) 
{

	ether_setup(dev);



	dev->priv_flags	       &= ~IFF_XMIT_DST_RELEASE;

	dev->priv_flags	       &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);

	dev->netdev_ops		= &macvlan_netdev_ops;

	dev->destructor		= free_netdev;

	dev->header_ops		= &macvlan_hard_header_ops,

drivers/net/tun.c

+1 −0
Original line number Diff line number Diff line
@@ -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);