Skip to content

Commit

Permalink
liquidio: Removed one line function stop_q
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Intiyaz Basha authored and David S. Miller committed Mar 25, 2018
1 parent 2a2faba commit 78a202f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
12 changes: 1 addition & 11 deletions drivers/net/ethernet/cavium/liquidio/lio_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,16 +523,6 @@ static inline void wake_q(struct net_device *netdev, int q)
netif_wake_subqueue(netdev, 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
Expand Down Expand Up @@ -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);

Expand Down
12 changes: 1 addition & 11 deletions drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,16 +294,6 @@ static void wake_q(struct net_device *netdev, int q)
netif_wake_subqueue(netdev, 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.
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 78a202f

Please sign in to comment.