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

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

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

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −15
Original line number Diff line number Diff line
@@ -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
@@ -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);

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+1 −15
Original line number Diff line number Diff line
@@ -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
@@ -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);

drivers/net/ethernet/cavium/liquidio/octeon_network.h

+10 −6
Original line number Diff line number Diff line
@@ -556,6 +556,9 @@ static inline void txqs_wake(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)) {

			int i;
@@ -565,6 +568,7 @@ static inline void txqs_start(struct net_device *netdev) 
			netif_start_queue(netdev);

		}

	}

}



static inline int skb_iq(struct lio *lio, struct sk_buff *skb)

{