diff options
| author |   Intiyaz Basha <intiyaz.basha@cavium.com> | 2018-03-23 17:37:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-25 16:18:53 -0400 |
| commit | 78a202f00d0970544ee96803b5b1c1fe65f8a433 (patch) | |
| tree | f897e7861d095130534b64471a3a3754f8fa1599 | |
| parent | liquidio: Removed netif_is_multiqueue check (diff) | |
| download | linux-dev-78a202f00d0970544ee96803b5b1c1fe65f8a433.tar.xz linux-dev-78a202f00d0970544ee96803b5b1c1fe65f8a433.zip | |
liquidio: Removed one line function stop_q
Removing one line function stop_q
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>
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_main.c | 12 | ||||
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 28575ed4652e..69a396d47eb8 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -524,16 +524,6 @@ static inline void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static inline void stop_q(struct net_device *netdev, int q) -{ - netif_stop_subqueue(netdev, q); -} - -/** * \brief Check Tx queue status, and take appropriate action * @param lio per-network private data * @returns 0 if full, number of queues woken up otherwise @@ -2750,7 +2740,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) netif_info(lio, tx_queued, lio->netdev, "Transmit queued successfully\n"); if (status == IQ_SEND_STOP) - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); netif_trans_update(netdev); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index f46289de1322..3120aed30c61 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -295,16 +295,6 @@ static void wake_q(struct net_device *netdev, int q) } /** - * \brief Stop a queue - * @param netdev network device - * @param q which queue to stop - */ -static void stop_q(struct net_device *netdev, int q) -{ - netif_stop_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. */ @@ -1803,7 +1793,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) if (status == IQ_SEND_STOP) { dev_err(&oct->pci_dev->dev, "Rcvd IQ_SEND_STOP signal; stopping IQ-%d\n", iq_no); - stop_q(netdev, q_idx); + netif_stop_subqueue(netdev, q_idx); } netif_trans_update(netdev); |