Skip to content

Commit

Permalink
liquidio: Removed start_txq function
Browse files Browse the repository at this point in the history
Removing start_txq function from VF and PF files

Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Acked-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Intiyaz Basha authored and David S. Miller committed Mar 25, 2018
1 parent c5662c8 commit a8c4a79
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 36 deletions.
16 changes: 1 addition & 15 deletions drivers/net/ethernet/cavium/liquidio/lio_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,20 +513,6 @@ static void liquidio_deinit_pci(void)
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
* @param netdev network device
Expand Down Expand Up @@ -2145,7 +2131,7 @@ static int liquidio_open(struct net_device *netdev)
return -1;
}

start_txq(netdev);
txqs_start(netdev);

/* tell Octeon to start forwarding packets to host */
send_rx_ctrl_cmd(lio, 1);
Expand Down
16 changes: 1 addition & 15 deletions drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,20 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = {
.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
* @param netdev network device
Expand Down Expand Up @@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_device *netdev)
lio->intf_open = 1;

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 */
send_rx_ctrl_cmd(lio, 1);
Expand Down
16 changes: 10 additions & 6 deletions drivers/net/ethernet/cavium/liquidio/octeon_network.h
Original file line number Diff line number Diff line change
Expand Up @@ -556,13 +556,17 @@ static inline void txqs_wake(struct net_device *netdev)
*/
static inline void txqs_start(struct net_device *netdev)
{
if (netif_is_multiqueue(netdev)) {
int i;
struct lio *lio = GET_LIO(netdev);

for (i = 0; i < netdev->num_tx_queues; i++)
netif_start_subqueue(netdev, i);
} else {
netif_start_queue(netdev);
if (lio->linfo.link.s.link_up) {
if (netif_is_multiqueue(netdev)) {
int i;

for (i = 0; i < netdev->num_tx_queues; i++)
netif_start_subqueue(netdev, i);
} else {
netif_start_queue(netdev);
}
}
}

Expand Down

0 comments on commit a8c4a79

Please sign in to comment.