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

Commit 0fb9a9ec authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

net/mac80211: Use wiphy_<level> 



Standardize logging messages from
	printk(KERN_<level> "%s: " fmt , wiphy_name(foo), args);
to
	wiphy_<level>(foo, fmt, args);

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b62177a0

net/mac80211/cfg.c

+3 −3
Original line number Diff line number Diff line
@@ -1123,9 +1123,9 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy, 
	p.uapsd = false;



	if (drv_conf_tx(local, params->queue, &p)) {

		printk(KERN_DEBUG "%s: failed to set TX queue "

		       "parameters for queue %d\n",

		       wiphy_name(local->hw.wiphy), params->queue);

		wiphy_debug(local->hw.wiphy,

			    "failed to set TX queue parameters for queue %d\n",

			    params->queue);

		return -EINVAL;

	}

net/mac80211/debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -85,13 +85,15 @@ static ssize_t tsf_write(struct file *file, 
	if (strncmp(buf, "reset", 5) == 0) {

		if (local->ops->reset_tsf) {

			drv_reset_tsf(local);

			printk(KERN_INFO "%s: debugfs reset TSF\n", wiphy_name(local->hw.wiphy));

			wiphy_info(local->hw.wiphy, "debugfs reset TSF\n");

		}

	} else {

		tsf = simple_strtoul(buf, NULL, 0);

		if (local->ops->set_tsf) {

			drv_set_tsf(local, tsf);

			printk(KERN_INFO "%s: debugfs set TSF to %#018llx\n", wiphy_name(local->hw.wiphy), tsf);

			wiphy_info(local->hw.wiphy,

				   "debugfs set TSF to %#018llx\n", tsf);



		}

	}

net/mac80211/ibss.c

+2 −2
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 
		return NULL;



#ifdef CONFIG_MAC80211_VERBOSE_DEBUG

	printk(KERN_DEBUG "%s: Adding new IBSS station %pM (dev=%s)\n",

	       wiphy_name(local->hw.wiphy), addr, sdata->name);

	wiphy_debug(local->hw.wiphy, "Adding new IBSS station %pM (dev=%s)\n",

		    addr, sdata->name);

#endif



	sta = sta_info_alloc(sdata, addr, gfp);

net/mac80211/iface.c

+2 −4
Original line number Diff line number Diff line
@@ -1175,8 +1175,7 @@ static u32 ieee80211_idle_off(struct ieee80211_local *local, 
		return 0;



#ifdef CONFIG_MAC80211_VERBOSE_DEBUG

	printk(KERN_DEBUG "%s: device no longer idle - %s\n",

	       wiphy_name(local->hw.wiphy), reason);

	wiphy_debug(local->hw.wiphy, "device no longer idle - %s\n", reason);

#endif



	local->hw.conf.flags &= ~IEEE80211_CONF_IDLE;
@@ -1189,8 +1188,7 @@ static u32 ieee80211_idle_on(struct ieee80211_local *local) 
		return 0;



#ifdef CONFIG_MAC80211_VERBOSE_DEBUG

	printk(KERN_DEBUG "%s: device now idle\n",

	       wiphy_name(local->hw.wiphy));

	wiphy_debug(local->hw.wiphy, "device now idle\n");

#endif



	drv_flush(local, false);

net/mac80211/key.c

+6 −8
Original line number Diff line number Diff line
@@ -87,9 +87,8 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) 
		key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;



	if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)

		printk(KERN_ERR "mac80211-%s: failed to set key "

		       "(%d, %pM) to hardware (%d)\n",

		       wiphy_name(key->local->hw.wiphy),

		wiphy_err(key->local->hw.wiphy,

			  "failed to set key (%d, %pM) to hardware (%d)\n",

			  key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);

}
@@ -121,9 +120,8 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) 
			  sta, &key->conf);



	if (ret)

		printk(KERN_ERR "mac80211-%s: failed to remove key "

		       "(%d, %pM) from hardware (%d)\n",

		       wiphy_name(key->local->hw.wiphy),

		wiphy_err(key->local->hw.wiphy,

			  "failed to remove key (%d, %pM) from hardware (%d)\n",

			  key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);



	key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;