diff options
| author |   Intiyaz Basha <intiyaz.basha@cavium.com> | 2018-03-23 17:37:41 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-25 16:18:54 -0400 |
| commit | 736b7ea555d05b3febf3ee56afd17834f2d20bc2 (patch) | |
| tree | 531a1ae5c86be6498378580ad398eb3f3ee70ffe | |
| parent | liquidio: Renamed txqs_wake to wake_txqs (diff) | |
| download | linux-dev-736b7ea555d05b3febf3ee56afd17834f2d20bc2.tar.xz linux-dev-736b7ea555d05b3febf3ee56afd17834f2d20bc2.zip | |
liquidio: Renamed txqs_stop to stop_txqs
For consistency renaming txqs_stop to stop_txqs
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 | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_network.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index d0359f5e9154..a474a46f1e4a 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -786,7 +786,7 @@ static inline void update_link_status(struct net_device *netdev, } else { dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__); netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { netif_info(lio, probe, lio->netdev, "Max MTU changed from %d to %d\n", diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 288096b39f46..4d7a0ae418c6 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -518,7 +518,7 @@ static void update_link_status(struct net_device *netdev, wake_txqs(netdev); } else { netif_carrier_off(netdev); - txqs_stop(netdev); + stop_txqs(netdev); } if (lio->linfo.link.s.mtu != current_max_mtu) { @@ -1186,7 +1186,7 @@ static int liquidio_stop(struct net_device *netdev) ifstate_reset(lio, LIO_IFSTATE_RUNNING); - txqs_stop(netdev); + stop_txqs(netdev); dev_info(&oct->pci_dev->dev, "%s interface is stopped\n", netdev->name); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index 3cbc65ae2acb..1b4c85ae98c3 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h @@ -510,7 +510,7 @@ static inline int wait_for_pending_requests(struct octeon_device *oct) * \brief Stop Tx queues * @param netdev network device */ -static inline void txqs_stop(struct net_device *netdev) +static inline void stop_txqs(struct net_device *netdev) { int i; |