staging: wfx: avoid namespace contamination

tx_policy_init() was already defined in driver cw1200. So, compilation
failed when wfx and cw1200 were both built-in.

In order to keep a coherent naming scheme, this patch prefixes all
"tx_policy_*" functions with "wfx_".

Fixes: 9bca45f3d692 ("staging: wfx: allow to send 802.11 frames")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191008094232.10014-8-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index b2ca3986c6d0320e9dbad54046211c850e93ecd4..6e4dd4ac55448eebfa0102bd5c010d5298c99619 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -37,7 +37,7 @@ static int wfx_get_hw_rate(struct wfx_dev *wdev, const struct ieee80211_tx_rate
 
 /* TX policy cache implementation */
 
-static void tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy,
+static void wfx_tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy,
                            struct ieee80211_tx_rate *rates)
 {
        int i;
@@ -124,7 +124,7 @@ static bool tx_policy_is_equal(const struct tx_policy *a, const struct tx_policy
        return !memcmp(a->rates, b->rates, sizeof(a->rates));
 }
 
-static int tx_policy_find(struct tx_policy_cache *cache, struct tx_policy *wanted)
+static int wfx_tx_policy_find(struct tx_policy_cache *cache, struct tx_policy *wanted)
 {
        struct tx_policy *it;
 
@@ -137,13 +137,13 @@ static int tx_policy_find(struct tx_policy_cache *cache, struct tx_policy *wante
        return -1;
 }
 
-static void tx_policy_use(struct tx_policy_cache *cache, struct tx_policy *entry)
+static void wfx_tx_policy_use(struct tx_policy_cache *cache, struct tx_policy *entry)
 {
        ++entry->usage_count;
        list_move(&entry->link, &cache->used);
 }
 
-static int tx_policy_release(struct tx_policy_cache *cache, struct tx_policy *entry)
+static int wfx_tx_policy_release(struct tx_policy_cache *cache, struct tx_policy *entry)
 {
        int ret = --entry->usage_count;
 
@@ -152,21 +152,21 @@ static int tx_policy_release(struct tx_policy_cache *cache, struct tx_policy *en
        return ret;
 }
 
-static int tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates,
+static int wfx_tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates,
                         bool *renew)
 {
        int idx;
        struct tx_policy_cache *cache = &wvif->tx_policy_cache;
        struct tx_policy wanted;
 
-       tx_policy_build(wvif, &wanted, rates);
+       wfx_tx_policy_build(wvif, &wanted, rates);
 
        spin_lock_bh(&cache->lock);
        if (WARN_ON(list_empty(&cache->free))) {
                spin_unlock_bh(&cache->lock);
                return WFX_INVALID_RATE_ID;
        }
-       idx = tx_policy_find(cache, &wanted);
+       idx = wfx_tx_policy_find(cache, &wanted);
        if (idx >= 0) {
                *renew = false;
        } else {
@@ -181,7 +181,7 @@ static int tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates,
                entry->usage_count = 0;
                idx = entry - cache->cache;
        }
-       tx_policy_use(cache, &cache->cache[idx]);
+       wfx_tx_policy_use(cache, &cache->cache[idx]);
        if (list_empty(&cache->free)) {
                /* Lock TX queues. */
                wfx_tx_queues_lock(wvif->wdev);
@@ -190,14 +190,14 @@ static int tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates,
        return idx;
 }
 
-static void tx_policy_put(struct wfx_vif *wvif, int idx)
+static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx)
 {
        int usage, locked;
        struct tx_policy_cache *cache = &wvif->tx_policy_cache;
 
        spin_lock_bh(&cache->lock);
        locked = list_empty(&cache->free);
-       usage = tx_policy_release(cache, &cache->cache[idx]);
+       usage = wfx_tx_policy_release(cache, &cache->cache[idx]);
        if (locked && !usage) {
                /* Unlock TX queues. */
                wfx_tx_queues_unlock(wvif->wdev);
@@ -205,7 +205,7 @@ static void tx_policy_put(struct wfx_vif *wvif, int idx)
        spin_unlock_bh(&cache->lock);
 }
 
-static int tx_policy_upload(struct wfx_vif *wvif)
+static int wfx_tx_policy_upload(struct wfx_vif *wvif)
 {
        int i;
        struct tx_policy_cache *cache = &wvif->tx_policy_cache;
@@ -238,18 +238,18 @@ static int tx_policy_upload(struct wfx_vif *wvif)
        return 0;
 }
 
-static void tx_policy_upload_work(struct work_struct *work)
+static void wfx_tx_policy_upload_work(struct work_struct *work)
 {
        struct wfx_vif *wvif =
                container_of(work, struct wfx_vif, tx_policy_upload_work);
 
-       tx_policy_upload(wvif);
+       wfx_tx_policy_upload(wvif);
 
        wfx_tx_unlock(wvif->wdev);
        wfx_tx_queues_unlock(wvif->wdev);
 }
 
-void tx_policy_init(struct wfx_vif *wvif)
+void wfx_tx_policy_init(struct wfx_vif *wvif)
 {
        struct tx_policy_cache *cache = &wvif->tx_policy_cache;
        int i;
@@ -259,7 +259,7 @@ void tx_policy_init(struct wfx_vif *wvif)
        spin_lock_init(&cache->lock);
        INIT_LIST_HEAD(&cache->used);
        INIT_LIST_HEAD(&cache->free);
-       INIT_WORK(&wvif->tx_policy_upload_work, tx_policy_upload_work);
+       INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);
 
        for (i = 0; i < HIF_MIB_NUM_TX_RATE_RETRY_POLICIES; ++i)
                list_add(&cache->cache[i].link, &cache->free);
@@ -527,7 +527,7 @@ static uint8_t wfx_tx_get_rate_id(struct wfx_vif *wvif, struct ieee80211_tx_info
        bool tx_policy_renew = false;
        uint8_t rate_id;
 
-       rate_id = tx_policy_get(wvif, tx_info->driver_rates, &tx_policy_renew);
+       rate_id = wfx_tx_policy_get(wvif, tx_info->driver_rates, &tx_policy_renew);
        WARN(rate_id == WFX_INVALID_RATE_ID, "unable to get a valid Tx policy");
 
        if (tx_policy_renew) {
@@ -794,6 +794,6 @@ void wfx_skb_dtor(struct wfx_dev *wdev, struct sk_buff *skb)
        WARN_ON(!wvif);
        skb_pull(skb, offset);
        wfx_notify_buffered_tx(wvif, skb, req);
-       tx_policy_put(wvif, req->tx_flags.retry_policy_index);
+       wfx_tx_policy_put(wvif, req->tx_flags.retry_policy_index);
        ieee80211_tx_status_irqsafe(wdev->hw, skb);
 }

diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h
index f59a259bb744d9c43d79fac7f24af0c3c520383a..0a19ef10a4abf0878be2bb0897077cc1f64f2370 100644 (file)
--- a/drivers/staging/wfx/data_tx.h
+++ b/drivers/staging/wfx/data_tx.h
@@ -60,7 +60,7 @@ struct wfx_tx_priv {
        uint8_t tid;
 } __packed;
 
-void tx_policy_init(struct wfx_vif *wvif);
+void wfx_tx_policy_init(struct wfx_vif *wvif);
 
 void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
            struct sk_buff *skb);

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 733b93a8f830da8d75ffda7735af2824afdfa2fb..3c715cc88ab29586a90f7093668f7c2f6ba34196 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -1534,7 +1534,7 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        }
        wfx_set_uapsd_param(wvif, &wvif->edca);
 
-       tx_policy_init(wvif);
+       wfx_tx_policy_init(wvif);
        wvif = NULL;
        while ((wvif = wvif_iterate(wdev, wvif)) != NULL) {
                // Combo mode does not support Block Acks. We can re-enable them