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

Commit 61ed713b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'drivers_iff_no_queue' 



Phil Sutter says:

====================
net: Convert drivers to IFF_NO_QUEUE and cleanup afterwards

This series converts in-tree users away from the old and deprecated
'tx_queue_len = 0' idiom, adds a warning to notify out-of-tree driver
maintainers that there is need for action on their behalf and finally drops any
workarounds in scheduling algorithm implementations.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0b233dc7 348e3435

drivers/net/bonding/bond_main.c

+1 −2
Original line number Diff line number Diff line
@@ -4120,9 +4120,8 @@ void bond_setup(struct net_device *bond_dev) 
	SET_NETDEV_DEVTYPE(bond_dev, &bond_type);



	/* Initialize the device options */

	bond_dev->tx_queue_len = 0;

	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;

	bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT;

	bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE;

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



	/* don't acquire bond device's netif_tx_lock when transmitting */

drivers/net/caif/caif_hsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ static void cfhsi_setup(struct net_device *dev) 
	dev->type = ARPHRD_CAIF;

	dev->flags = IFF_POINTOPOINT | IFF_NOARP;

	dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ;

	dev->tx_queue_len = 0;

	dev->priv_flags |= IFF_NO_QUEUE;

	dev->destructor = free_netdev;

	dev->netdev_ops = &cfhsi_netdevops;

	for (i = 0; i < CFHSI_PRIO_LAST; ++i)

drivers/net/caif/caif_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void caifdev_setup(struct net_device *dev) 
	dev->type = ARPHRD_CAIF;

	dev->flags = IFF_POINTOPOINT | IFF_NOARP;

	dev->mtu = CAIF_MAX_MTU;

	dev->tx_queue_len = 0;

	dev->priv_flags |= IFF_NO_QUEUE;

	dev->destructor = free_netdev;

	skb_queue_head_init(&serdev->head);

	serdev->common.link_select = CAIF_LINK_LOW_LATENCY;

drivers/net/caif/caif_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static void cfspi_setup(struct net_device *dev) 
	dev->netdev_ops = &cfspi_ops;

	dev->type = ARPHRD_CAIF;

	dev->flags = IFF_NOARP | IFF_POINTOPOINT;

	dev->tx_queue_len = 0;

	dev->priv_flags |= IFF_NO_QUEUE;

	dev->mtu = SPI_MAX_PAYLOAD_SIZE;

	dev->destructor = free_netdev;

	skb_queue_head_init(&cfspi->qhead);

drivers/net/dummy.c

+1 −2
Original line number Diff line number Diff line
@@ -144,10 +144,9 @@ static void dummy_setup(struct net_device *dev) 
	dev->destructor = free_netdev;



	/* Fill in device structure with ethernet-generic values. */

	dev->tx_queue_len = 0;

	dev->flags |= IFF_NOARP;

	dev->flags &= ~IFF_MULTICAST;

	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;

	dev->features	|= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO;

	dev->features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;

	eth_hw_addr_random(dev);