aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-18 17:29:20 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:32 -0400
commitdd1cd4c620c174ebbdf78dc01b924115a06de5d3 (patch)
treea04517b9ee2ede228ec4a8ab96099460060c4245 /net/mac80211
parent9c7d7728baf79c63ae58df95fb39ea13db487599 (diff)
[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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211.c14
-rw-r--r--net/mac80211/ieee80211_rate.c4
-rw-r--r--net/mac80211/ieee80211_sta.c2
-rw-r--r--net/mac80211/rx.c3
-rw-r--r--net/mac80211/sta_info.c4
-rw-r--r--net/mac80211/tx.c9
6 files changed, 19 insertions, 17 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 5e924588e9a..4a213a20373 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -814,7 +814,7 @@ static void ieee80211_tasklet_handler(unsigned long data)
814 break; 814 break;
815 default: /* should never get here! */ 815 default: /* should never get here! */
816 printk(KERN_ERR "%s: Unknown message type (%d)\n", 816 printk(KERN_ERR "%s: Unknown message type (%d)\n",
817 local->mdev->name, skb->pkt_type); 817 wiphy_name(local->hw.wiphy), skb->pkt_type);
818 dev_kfree_skb(skb); 818 dev_kfree_skb(skb);
819 break; 819 break;
820 } 820 }
@@ -904,7 +904,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
904 if (!status) { 904 if (!status) {
905 printk(KERN_ERR 905 printk(KERN_ERR
906 "%s: ieee80211_tx_status called with NULL status\n", 906 "%s: ieee80211_tx_status called with NULL status\n",
907 local->mdev->name); 907 wiphy_name(local->hw.wiphy));
908 dev_kfree_skb(skb); 908 dev_kfree_skb(skb);
909 return; 909 return;
910 } 910 }
@@ -961,7 +961,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
961 printk(KERN_DEBUG "%s: dropped TX " 961 printk(KERN_DEBUG "%s: dropped TX "
962 "filtered frame queue_len=%d " 962 "filtered frame queue_len=%d "
963 "PS=%d @%lu\n", 963 "PS=%d @%lu\n",
964 local->mdev->name, 964 wiphy_name(local->hw.wiphy),
965 skb_queue_len( 965 skb_queue_len(
966 &sta->tx_filtered), 966 &sta->tx_filtered),
967 !!(sta->flags & WLAN_STA_PS), 967 !!(sta->flags & WLAN_STA_PS),
@@ -1282,7 +1282,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
1282 result = ieee80211_init_rate_ctrl_alg(local, NULL); 1282 result = ieee80211_init_rate_ctrl_alg(local, NULL);
1283 if (result < 0) { 1283 if (result < 0) {
1284 printk(KERN_DEBUG "%s: Failed to initialize rate control " 1284 printk(KERN_DEBUG "%s: Failed to initialize rate control "
1285 "algorithm\n", local->mdev->name); 1285 "algorithm\n", wiphy_name(local->hw.wiphy));
1286 goto fail_rate; 1286 goto fail_rate;
1287 } 1287 }
1288 1288
@@ -1290,7 +1290,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
1290 1290
1291 if (result < 0) { 1291 if (result < 0) {
1292 printk(KERN_DEBUG "%s: Failed to initialize wep\n", 1292 printk(KERN_DEBUG "%s: Failed to initialize wep\n",
1293 local->mdev->name); 1293 wiphy_name(local->hw.wiphy));
1294 goto fail_wep; 1294 goto fail_wep;
1295 } 1295 }
1296 1296
@@ -1301,7 +1301,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
1301 IEEE80211_IF_TYPE_STA); 1301 IEEE80211_IF_TYPE_STA);
1302 if (result) 1302 if (result)
1303 printk(KERN_WARNING "%s: Failed to add default virtual iface\n", 1303 printk(KERN_WARNING "%s: Failed to add default virtual iface\n",
1304 local->mdev->name); 1304 wiphy_name(local->hw.wiphy));
1305 1305
1306 local->reg_state = IEEE80211_DEV_REGISTERED; 1306 local->reg_state = IEEE80211_DEV_REGISTERED;
1307 rtnl_unlock(); 1307 rtnl_unlock();
@@ -1401,7 +1401,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
1401 if (skb_queue_len(&local->skb_queue) 1401 if (skb_queue_len(&local->skb_queue)
1402 || skb_queue_len(&local->skb_queue_unreliable)) 1402 || skb_queue_len(&local->skb_queue_unreliable))
1403 printk(KERN_WARNING "%s: skb_queue not empty\n", 1403 printk(KERN_WARNING "%s: skb_queue not empty\n",
1404 local->mdev->name); 1404 wiphy_name(local->hw.wiphy));
1405 skb_queue_purge(&local->skb_queue); 1405 skb_queue_purge(&local->skb_queue);
1406 skb_queue_purge(&local->skb_queue_unreliable); 1406 skb_queue_purge(&local->skb_queue_unreliable);
1407 1407
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index a1ded744978..91a9fe2cbad 100644
--- 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,
152 ref = rate_control_alloc(name, local); 152 ref = rate_control_alloc(name, local);
153 if (!ref) { 153 if (!ref) {
154 printk(KERN_WARNING "%s: Failed to select rate control " 154 printk(KERN_WARNING "%s: Failed to select rate control "
155 "algorithm\n", local->mdev->name); 155 "algorithm\n", wiphy_name(local->hw.wiphy));
156 return -ENOENT; 156 return -ENOENT;
157 } 157 }
158 158
@@ -164,7 +164,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
164 } 164 }
165 165
166 printk(KERN_DEBUG "%s: Selected rate control " 166 printk(KERN_DEBUG "%s: Selected rate control "
167 "algorithm '%s'\n", local->mdev->name, 167 "algorithm '%s'\n", wiphy_name(local->hw.wiphy),
168 ref->ops->name); 168 ref->ops->name);
169 169
170 170
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index f47cbd294ce..8a4f2441b59 100644
--- 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,
3104 } 3104 }
3105 3105
3106 printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n", 3106 printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n",
3107 local->mdev->name, print_mac(mac, addr), dev->name); 3107 wiphy_name(local->hw.wiphy), print_mac(mac, addr), dev->name);
3108 3108
3109 sta = sta_info_add(local, dev, addr, GFP_ATOMIC); 3109 sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
3110 if (!sta) 3110 if (!sta)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9700c1c5b3c..b5f2e4c25c7 100644
--- 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,
1474 if (net_ratelimit()) 1474 if (net_ratelimit())
1475 printk(KERN_DEBUG "%s: failed to copy " 1475 printk(KERN_DEBUG "%s: failed to copy "
1476 "multicast frame for %s", 1476 "multicast frame for %s",
1477 local->mdev->name, prev->dev->name); 1477 wiphy_name(local->hw.wiphy),
1478 prev->dev->name);
1478 continue; 1479 continue;
1479 } 1480 }
1480 rx.skb = skb_new; 1481 rx.skb = skb_new;
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 44d98340495..7c7df87f673 100644
--- 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,
166 166
167#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 167#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
168 printk(KERN_DEBUG "%s: Added STA %s\n", 168 printk(KERN_DEBUG "%s: Added STA %s\n",
169 local->mdev->name, print_mac(mac, addr)); 169 wiphy_name(local->hw.wiphy), print_mac(mac, addr));
170#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ 170#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
171 171
172#ifdef CONFIG_MAC80211_DEBUGFS 172#ifdef CONFIG_MAC80211_DEBUGFS
@@ -226,7 +226,7 @@ void sta_info_free(struct sta_info *sta)
226 226
227#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 227#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
228 printk(KERN_DEBUG "%s: Removed STA %s\n", 228 printk(KERN_DEBUG "%s: Removed STA %s\n",
229 local->mdev->name, print_mac(mac, sta->addr)); 229 wiphy_name(local->hw.wiphy), print_mac(mac, sta->addr));
230#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ 230#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
231 231
232 ieee80211_key_free(sta->key); 232 ieee80211_key_free(sta->key);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e33f7641e6b..38394c40f6a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -324,7 +324,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
324 324
325 local->total_ps_buffered = total; 325 local->total_ps_buffered = total;
326 printk(KERN_DEBUG "%s: PS buffers full - purged %d frames\n", 326 printk(KERN_DEBUG "%s: PS buffers full - purged %d frames\n",
327 local->mdev->name, purged); 327 wiphy_name(local->hw.wiphy), purged);
328} 328}
329 329
330static inline ieee80211_txrx_result 330static inline ieee80211_txrx_result
@@ -1049,7 +1049,8 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
1049 return IEEE80211_TX_AGAIN; 1049 return IEEE80211_TX_AGAIN;
1050 } 1050 }
1051 if (skb) { 1051 if (skb) {
1052 ieee80211_dump_frame(local->mdev->name, "TX to low-level driver", skb); 1052 ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
1053 "TX to low-level driver", skb);
1053 ret = local->ops->tx(local_to_hw(local), skb, control); 1054 ret = local->ops->tx(local_to_hw(local), skb, control);
1054 if (ret) 1055 if (ret)
1055 return IEEE80211_TX_AGAIN; 1056 return IEEE80211_TX_AGAIN;
@@ -1077,7 +1078,7 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
1077 ~IEEE80211_TXCTL_RATE_CTRL_PROBE; 1078 ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
1078 } 1079 }
1079 1080
1080 ieee80211_dump_frame(local->mdev->name, 1081 ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
1081 "TX to low-level driver", 1082 "TX to low-level driver",
1082 tx->u.tx.extra_frag[i]); 1083 tx->u.tx.extra_frag[i]);
1083 ret = local->ops->tx(local_to_hw(local), 1084 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,
1799 if (!rate) { 1800 if (!rate) {
1800 if (net_ratelimit()) { 1801 if (net_ratelimit()) {
1801 printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate " 1802 printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
1802 "found\n", local->mdev->name); 1803 "found\n", wiphy_name(local->hw.wiphy));
1803 } 1804 }
1804 dev_kfree_skb(skb); 1805 dev_kfree_skb(skb);
1805 return NULL; 1806 return NULL;