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

Commit 7a7c1705 authored Apr 16, 2016 by David S. Miller

Merge branch 'IFF_NO_QUEUE-followups'



Phil Sutter says:

====================
Minor IFF_NO_QUEUE conversion follow-up

The following series converts two further drivers away from setting
'tx_queue_len = 0' to adding IFF_NO_QUEUE to priv_flags instead.

The first one, rtl8188eu in staging didn't exist back when all drivers
were converted. The second one, openvswitch seems to have slipped through
my grep'ing back then, no idea why.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 89764d59 4272cc51

drivers/staging/rtl8188eu/os_dep/mon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ static void mon_setup(struct net_device *dev)
		dev->netdev_ops = &mon_netdev_ops;
		dev->destructor = free_netdev;
		ether_setup(dev);
		dev->tx_queue_len = 0;
		dev->priv_flags \|= IFF_NO_QUEUE;
		dev->type = ARPHRD_IEEE80211;
		/*
		* Use a locally administered address (IEEE 802)

net/openvswitch/vport-internal_dev.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -165,11 +165,10 @@ static void do_setup(struct net_device *netdev)

		netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
		netdev->priv_flags \|= IFF_LIVE_ADDR_CHANGE \| IFF_OPENVSWITCH \|
		IFF_PHONY_HEADROOM;
		IFF_PHONY_HEADROOM \| IFF_NO_QUEUE;
		netdev->destructor = internal_dev_destructor;
		netdev->ethtool_ops = &internal_dev_ethtool_ops;
		netdev->rtnl_link_ops = &internal_dev_link_ops;
		netdev->tx_queue_len = 0;

		netdev->features = NETIF_F_LLTX \| NETIF_F_SG \| NETIF_F_FRAGLIST \|
		NETIF_F_HIGHDMA \| NETIF_F_HW_CSUM \|