Commit a8c4a792 authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller

liquidio: Removed start_txq function

Removing start_txq function from VF and PF files
Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Acked-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5662c8c
...@@ -513,20 +513,6 @@ static void liquidio_deinit_pci(void) ...@@ -513,20 +513,6 @@ static void liquidio_deinit_pci(void)
pci_unregister_driver(&liquidio_pci_driver); pci_unregister_driver(&liquidio_pci_driver);
} }
/**
* \brief Start Tx queue
* @param netdev network device
*/
static void start_txq(struct net_device *netdev)
{
struct lio *lio = GET_LIO(netdev);
if (lio->linfo.link.s.link_up) {
txqs_start(netdev);
return;
}
}
/** /**
* \brief Wake a queue * \brief Wake a queue
* @param netdev network device * @param netdev network device
...@@ -2145,7 +2131,7 @@ static int liquidio_open(struct net_device *netdev) ...@@ -2145,7 +2131,7 @@ static int liquidio_open(struct net_device *netdev)
return -1; return -1;
} }
start_txq(netdev); txqs_start(netdev);
/* tell Octeon to start forwarding packets to host */ /* tell Octeon to start forwarding packets to host */
send_rx_ctrl_cmd(lio, 1); send_rx_ctrl_cmd(lio, 1);
......
...@@ -284,20 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = { ...@@ -284,20 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = {
.err_handler = &liquidio_vf_err_handler, /* For AER */ .err_handler = &liquidio_vf_err_handler, /* For AER */
}; };
/**
* \brief Start Tx queue
* @param netdev network device
*/
static void start_txq(struct net_device *netdev)
{
struct lio *lio = GET_LIO(netdev);
if (lio->linfo.link.s.link_up) {
txqs_start(netdev);
return;
}
}
/** /**
* \brief Wake a queue * \brief Wake a queue
* @param netdev network device * @param netdev network device
...@@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_device *netdev) ...@@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_device *netdev)
lio->intf_open = 1; lio->intf_open = 1;
netif_info(lio, ifup, lio->netdev, "Interface Open, ready for traffic\n"); netif_info(lio, ifup, lio->netdev, "Interface Open, ready for traffic\n");
start_txq(netdev); txqs_start(netdev);
/* tell Octeon to start forwarding packets to host */ /* tell Octeon to start forwarding packets to host */
send_rx_ctrl_cmd(lio, 1); send_rx_ctrl_cmd(lio, 1);
......
...@@ -556,13 +556,17 @@ static inline void txqs_wake(struct net_device *netdev) ...@@ -556,13 +556,17 @@ static inline void txqs_wake(struct net_device *netdev)
*/ */
static inline void txqs_start(struct net_device *netdev) static inline void txqs_start(struct net_device *netdev)
{ {
if (netif_is_multiqueue(netdev)) { struct lio *lio = GET_LIO(netdev);
int i;
for (i = 0; i < netdev->num_tx_queues; i++) if (lio->linfo.link.s.link_up) {
netif_start_subqueue(netdev, i); if (netif_is_multiqueue(netdev)) {
} else { int i;
netif_start_queue(netdev);
for (i = 0; i < netdev->num_tx_queues; i++)
netif_start_subqueue(netdev, i);
} else {
netif_start_queue(netdev);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment