OSDN Git Service

liquidio: Renamed txqs_wake to wake_txqs
authorIntiyaz Basha <intiyaz.basha@cavium.com>
Sat, 24 Mar 2018 00:37:39 +0000 (17:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 25 Mar 2018 20:18:54 +0000 (16:18 -0400)
For consistency renaming txqs_wake to wake_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>
drivers/net/ethernet/cavium/liquidio/lio_main.c
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
drivers/net/ethernet/cavium/liquidio/octeon_network.h

index 75131dc..d0359f5 100644 (file)
@@ -782,7 +782,7 @@ static inline void update_link_status(struct net_device *netdev,
                if (lio->linfo.link.s.link_up) {
                        dev_dbg(&oct->pci_dev->dev, "%s: link_up", __func__);
                        netif_carrier_on(netdev);
-                       txqs_wake(netdev);
+                       wake_txqs(netdev);
                } else {
                        dev_dbg(&oct->pci_dev->dev, "%s: link_off", __func__);
                        netif_carrier_off(netdev);
@@ -2768,7 +2768,7 @@ static void liquidio_tx_timeout(struct net_device *netdev)
                   "Transmit timeout tx_dropped:%ld, waking up queues now!!\n",
                   netdev->stats.tx_dropped);
        netif_trans_update(netdev);
-       txqs_wake(netdev);
+       wake_txqs(netdev);
 }
 
 static int liquidio_vlan_rx_add_vid(struct net_device *netdev,
index 478c20a..288096b 100644 (file)
@@ -515,7 +515,7 @@ static void update_link_status(struct net_device *netdev,
 
                if (lio->linfo.link.s.link_up) {
                        netif_carrier_on(netdev);
-                       txqs_wake(netdev);
+                       wake_txqs(netdev);
                } else {
                        netif_carrier_off(netdev);
                        txqs_stop(netdev);
@@ -1822,7 +1822,7 @@ static void liquidio_tx_timeout(struct net_device *netdev)
                   "Transmit timeout tx_dropped:%ld, waking up queues now!!\n",
                   netdev->stats.tx_dropped);
        netif_trans_update(netdev);
-       txqs_wake(netdev);
+       wake_txqs(netdev);
 }
 
 static int
index 7922a69..3cbc65a 100644 (file)
@@ -522,7 +522,7 @@ static inline void txqs_stop(struct net_device *netdev)
  * \brief Wake Tx queues
  * @param netdev network device
  */
-static inline void txqs_wake(struct net_device *netdev)
+static inline void wake_txqs(struct net_device *netdev)
 {
        struct lio *lio = GET_LIO(netdev);
        int i, qno;