[MAC80211]: print out wiphy name instead of master device

This makes mac80211 print out the wiphy name instead of the
master device name where appropriate.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 5e92458..4a213a2 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -814,7 +814,7 @@ static void ieee80211_tasklet_handler(unsigned long data)
                        break;
                default: /* should never get here! */
                        printk(KERN_ERR "%s: Unknown message type (%d)\n",
-                              local->mdev->name, skb->pkt_type);
+                              wiphy_name(local->hw.wiphy), skb->pkt_type);
                        dev_kfree_skb(skb);
                        break;
                }
@@ -904,7 +904,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
        if (!status) {
                printk(KERN_ERR
                       "%s: ieee80211_tx_status called with NULL status\n",
-                      local->mdev->name);
+                      wiphy_name(local->hw.wiphy));
                dev_kfree_skb(skb);
                return;
        }
@@ -961,7 +961,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
                                        printk(KERN_DEBUG "%s: dropped TX "
                                               "filtered frame queue_len=%d "
                                               "PS=%d @%lu\n",
-                                              local->mdev->name,
+                                              wiphy_name(local->hw.wiphy),
                                               skb_queue_len(
                                                       &sta->tx_filtered),
                                               !!(sta->flags & WLAN_STA_PS),
@@ -1282,7 +1282,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
        result = ieee80211_init_rate_ctrl_alg(local, NULL);
        if (result < 0) {
                printk(KERN_DEBUG "%s: Failed to initialize rate control "
-                      "algorithm\n", local->mdev->name);
+                      "algorithm\n", wiphy_name(local->hw.wiphy));
                goto fail_rate;
        }
 
@@ -1290,7 +1290,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
        if (result < 0) {
                printk(KERN_DEBUG "%s: Failed to initialize wep\n",
-                      local->mdev->name);
+                      wiphy_name(local->hw.wiphy));
                goto fail_wep;
        }
 
@@ -1301,7 +1301,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                                  IEEE80211_IF_TYPE_STA);
        if (result)
                printk(KERN_WARNING "%s: Failed to add default virtual iface\n",
-                      local->mdev->name);
+                      wiphy_name(local->hw.wiphy));
 
        local->reg_state = IEEE80211_DEV_REGISTERED;
        rtnl_unlock();
@@ -1401,7 +1401,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
        if (skb_queue_len(&local->skb_queue)
                        || skb_queue_len(&local->skb_queue_unreliable))
                printk(KERN_WARNING "%s: skb_queue not empty\n",
-                      local->mdev->name);
+                      wiphy_name(local->hw.wiphy));
        skb_queue_purge(&local->skb_queue);
        skb_queue_purge(&local->skb_queue_unreliable);
 

diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index a1ded74..91a9fe2 100644 (file)
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/ieee80211_rate.c
@@ -152,7 +152,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
        ref = rate_control_alloc(name, local);
        if (!ref) {
                printk(KERN_WARNING "%s: Failed to select rate control "
-                      "algorithm\n", local->mdev->name);
+                      "algorithm\n", wiphy_name(local->hw.wiphy));
                return -ENOENT;
        }
 
@@ -164,7 +164,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
        }
 
        printk(KERN_DEBUG "%s: Selected rate control "
-              "algorithm '%s'\n", local->mdev->name,
+              "algorithm '%s'\n", wiphy_name(local->hw.wiphy),
               ref->ops->name);
 
 

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index f47cbd2..8a4f244 100644 (file)
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3104,7 +3104,7 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
        }
 
        printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n",
-              local->mdev->name, print_mac(mac, addr), dev->name);
+              wiphy_name(local->hw.wiphy), print_mac(mac, addr), dev->name);
 
        sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
        if (!sta)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9700c1c..b5f2e4c 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1474,7 +1474,8 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
                        if (net_ratelimit())
                                printk(KERN_DEBUG "%s: failed to copy "
                                       "multicast frame for %s",
-                                      local->mdev->name, prev->dev->name);
+                                      wiphy_name(local->hw.wiphy),
+                                      prev->dev->name);
                        continue;
                }
                rx.skb = skb_new;

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 44d9834..7c7df87 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -166,7 +166,7 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
        printk(KERN_DEBUG "%s: Added STA %s\n",
-              local->mdev->name, print_mac(mac, addr));
+              wiphy_name(local->hw.wiphy), print_mac(mac, addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -226,7 +226,7 @@ void sta_info_free(struct sta_info *sta)
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
        printk(KERN_DEBUG "%s: Removed STA %s\n",
-              local->mdev->name, print_mac(mac, sta->addr));
+              wiphy_name(local->hw.wiphy), print_mac(mac, sta->addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
        ieee80211_key_free(sta->key);

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e33f764..38394c4 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -324,7 +324,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
 
        local->total_ps_buffered = total;
        printk(KERN_DEBUG "%s: PS buffers full - purged %d frames\n",
-              local->mdev->name, purged);
+              wiphy_name(local->hw.wiphy), purged);
 }
 
 static inline ieee80211_txrx_result
@@ -1049,7 +1049,8 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
                return IEEE80211_TX_AGAIN;
        }
        if (skb) {
-               ieee80211_dump_frame(local->mdev->name, "TX to low-level driver", skb);
+               ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
+                                    "TX to low-level driver", skb);
                ret = local->ops->tx(local_to_hw(local), skb, control);
                if (ret)
                        return IEEE80211_TX_AGAIN;
@@ -1077,7 +1078,7 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
                                                ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
                        }
 
-                       ieee80211_dump_frame(local->mdev->name,
+                       ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
                                             "TX to low-level driver",
                                             tx->u.tx.extra_frag[i]);
                        ret = local->ops->tx(local_to_hw(local),
@@ -1799,7 +1800,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
                if (!rate) {
                        if (net_ratelimit()) {
                                printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
-                                      "found\n", local->mdev->name);
+                                      "found\n", wiphy_name(local->hw.wiphy));
                        }
                        dev_kfree_skb(skb);
                        return NULL;