Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1cd4c6 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c7d7728

net/mac80211/ieee80211.c

+7 −7
Original line number Diff line number Diff line
@@ -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);

net/mac80211/ieee80211_rate.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/mac80211/ieee80211_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

net/mac80211/sta_info.c

+2 −2
Original line number Diff line number Diff line
@@ -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);