openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

liquidio: Removed start_txq function 

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>
This commit is contained in:
Intiyaz Basha 2018-03-23 17:37:25 -07:00 committed by David S. Miller
parent c5662c8c6d
commit a8c4a79264
3 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/cavium/liquidio/lio_main.c
View File

@ -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)
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);

16
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
View File

@ -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)
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);

4
drivers/net/ethernet/cavium/liquidio/octeon_network.h
View File

@ -556,6 +556,9 @@ 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)
{ {
struct lio *lio = GET_LIO(netdev);
if (lio->linfo.link.s.link_up) {
if (netif_is_multiqueue(netdev)) { if (netif_is_multiqueue(netdev)) {
int i; int i;
@ -564,6 +567,7 @@ static inline void txqs_start(struct net_device *netdev)
} else { } else {
netif_start_queue(netdev); netif_start_queue(netdev);
} }
}
} }
static inline int skb_iq(struct lio *lio, struct sk_buff *skb) static inline int skb_iq(struct lio *lio, struct sk_buff *skb)