Skip to content

Commit 53c7886

Browse files
Casey Leedomdavem330
authored andcommitted
cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue()
Don't implement (struct net_device_ops *)->ndo_select_queue() with simple call to skb_tx_hash(). This leads to non-persistent TX queue selection in the Linux dev_pick_tx() routine for TCP connections. Signed-off-by: Casey Leedom <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5e09a10 commit 53c7886

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

drivers/net/cxgb4vf/cxgb4vf_main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,18 +1103,6 @@ static int cxgb4vf_set_mac_addr(struct net_device *dev, void *_addr)
11031103
return 0;
11041104
}
11051105

1106-
/*
1107-
* Return a TX Queue on which to send the specified skb.
1108-
*/
1109-
static u16 cxgb4vf_select_queue(struct net_device *dev, struct sk_buff *skb)
1110-
{
1111-
/*
1112-
* XXX For now just use the default hash but we probably want to
1113-
* XXX look at other possibilities ...
1114-
*/
1115-
return skb_tx_hash(dev, skb);
1116-
}
1117-
11181106
#ifdef CONFIG_NET_POLL_CONTROLLER
11191107
/*
11201108
* Poll all of our receive queues. This is called outside of normal interrupt
@@ -2417,7 +2405,6 @@ static const struct net_device_ops cxgb4vf_netdev_ops = {
24172405
.ndo_get_stats = cxgb4vf_get_stats,
24182406
.ndo_set_rx_mode = cxgb4vf_set_rxmode,
24192407
.ndo_set_mac_address = cxgb4vf_set_mac_addr,
2420-
.ndo_select_queue = cxgb4vf_select_queue,
24212408
.ndo_validate_addr = eth_validate_addr,
24222409
.ndo_do_ioctl = cxgb4vf_do_ioctl,
24232410
.ndo_change_mtu = cxgb4vf_change_mtu,
@@ -2624,7 +2611,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
26242611
netdev->do_ioctl = cxgb4vf_do_ioctl;
26252612
netdev->change_mtu = cxgb4vf_change_mtu;
26262613
netdev->set_mac_address = cxgb4vf_set_mac_addr;
2627-
netdev->select_queue = cxgb4vf_select_queue;
26282614
#ifdef CONFIG_NET_POLL_CONTROLLER
26292615
netdev->poll_controller = cxgb4vf_poll_controller;
26302616
#endif

0 commit comments

Comments
 (0)