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

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

liquidio: Removed one line function wake_q 



Removing one line function wake_q

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 78a202f0

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

+2 −12
Original line number Diff line number Diff line
@@ -513,16 +513,6 @@ static void liquidio_deinit_pci(void) 
	pci_unregister_driver(&liquidio_pci_driver);

}



/**

 * \brief Wake a queue

 * @param netdev network device

 * @param q which queue to wake

 */

static inline void wake_q(struct net_device *netdev, int q)

{

	netif_wake_subqueue(netdev, q);

}



/**

 * \brief Check Tx queue status, and take appropriate action

 * @param lio per-network private data
@@ -541,7 +531,7 @@ static inline int check_txq_status(struct lio *lio) 
		if (octnet_iq_is_full(lio->oct_dev, iq))

			continue;

		if (__netif_subqueue_stopped(lio->netdev, q)) {

			wake_q(lio->netdev, q);

			netif_wake_subqueue(lio->netdev, q);

			INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq,

						  tx_restart, 1);

			ret_val++;
@@ -1661,7 +1651,7 @@ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb) 


	if (__netif_subqueue_stopped(lio->netdev, q)) {

		INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);

		wake_q(lio->netdev, q);

		netif_wake_subqueue(lio->netdev, q);

	}

	return 1;

}

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

+1 −11
Original line number Diff line number Diff line
@@ -284,16 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = { 
	.err_handler	= &liquidio_vf_err_handler,    /* For AER */

};



/**

 * \brief Wake a queue

 * @param netdev network device

 * @param q which queue to wake

 */

static void wake_q(struct net_device *netdev, int q)

{

	netif_wake_subqueue(netdev, q);

}



/**

 * Remove the node at the head of the list. The list would be empty at

 * the end of this call if there are no more nodes in the list.
@@ -980,7 +970,7 @@ static int check_txq_state(struct lio *lio, struct sk_buff *skb) 


	if (__netif_subqueue_stopped(lio->netdev, q)) {

		INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);

		wake_q(lio->netdev, q);

		netif_wake_subqueue(lio->netdev, q);

	}



	return 1;