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

Commit e91d8334 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: remove print_mac uses 



Use %pM instead, and also remove stray variables
declared with DECLARE_MAC_BUF.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04dc882d

drivers/net/wireless/ath/ar9170/main.c

+0 −1
Original line number Diff line number Diff line
@@ -2628,7 +2628,6 @@ static int ar9170_read_eeprom(struct ar9170 *ar) 
{

#define RW	8	/* number of words to read at once */

#define RB	(sizeof(u32) * RW)

	DECLARE_MAC_BUF(mbuf);

	u8 *eeprom = (void *)&ar->eeprom;

	u8 *addr = ar->eeprom.mac_address;

	__le32 offsets[RW];

drivers/net/wireless/b43/main.c

+1 −3
Original line number Diff line number Diff line
@@ -938,7 +938,6 @@ static void b43_clear_keys(struct b43_wldev *dev) 
static void b43_dump_keymemory(struct b43_wldev *dev)

{

	unsigned int i, index, offset;

	DECLARE_MAC_BUF(macbuf);

	u8 mac[ETH_ALEN];

	u16 algo;

	u32 rcmta0;
@@ -973,8 +972,7 @@ static void b43_dump_keymemory(struct b43_wldev *dev) 
						((index - 4) * 2) + 1);

			*((__le32 *)(&mac[0])) = cpu_to_le32(rcmta0);

			*((__le16 *)(&mac[4])) = cpu_to_le16(rcmta1);

			printk("   MAC: %s",

			       print_mac(macbuf, mac));

			printk("   MAC: %pM", mac);

		} else

			printk("   DEFAULT KEY");

		printk("\n");

drivers/net/wireless/libertas/assoc.c

+3 −7
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static int lbs_set_authentication(struct lbs_private *priv, u8 bssid[6], u8 auth 
{

	struct cmd_ds_802_11_authenticate cmd;

	int ret = -1;

	DECLARE_MAC_BUF(mac);



	lbs_deb_enter(LBS_DEB_JOIN);
@@ -138,8 +137,7 @@ static int lbs_set_authentication(struct lbs_private *priv, u8 bssid[6], u8 auth 


	cmd.authtype = iw_auth_to_ieee_auth(auth);



	lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n",

		print_mac(mac, bssid), cmd.authtype);

	lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n", bssid, cmd.authtype);



	ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd);
@@ -342,8 +340,6 @@ static int lbs_associate(struct lbs_private *priv, 


	/* Firmware v9+ indicate authentication suites as a TLV */

	if (priv->fwrelease >= 0x09000000) {

		DECLARE_MAC_BUF(mac);



		auth = (struct mrvl_ie_auth_type *) pos;

		auth->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE);

		auth->header.len = cpu_to_le16(2);
@@ -351,8 +347,8 @@ static int lbs_associate(struct lbs_private *priv, 
		auth->auth = cpu_to_le16(tmpauth);

		pos += sizeof(auth->header) + 2;



		lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n",

			print_mac(mac, bss->bssid), priv->secinfo.auth_mode);

		lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n",

			bss->bssid, priv->secinfo.auth_mode);

	}



	/* WPA/WPA2 IEs */

drivers/net/wireless/mac80211_hwsim.c

+0 −2
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif) 
{

	struct mac80211_hwsim_data *data = dat;

	struct hwsim_vif_priv *vp = (void *)vif->drv_priv;

	DECLARE_MAC_BUF(buf);

	struct sk_buff *skb;

	struct ieee80211_pspoll *pspoll;
@@ -867,7 +866,6 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, 
				struct ieee80211_vif *vif, int ps)

{

	struct hwsim_vif_priv *vp = (void *)vif->drv_priv;

	DECLARE_MAC_BUF(buf);

	struct sk_buff *skb;

	struct ieee80211_hdr *hdr;

drivers/net/wireless/mwl8k.c

+2 −4
Original line number Diff line number Diff line
@@ -2271,7 +2271,6 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw, 
	struct mwl8k_cmd_update_sta_db *cmd;

	struct peer_capability_info *peer_info;

	struct ieee80211_rate *bitrates = mv_vif->legacy_rates;

	DECLARE_MAC_BUF(mac);

	int rc;

	__u8 count, *rates;
@@ -3480,7 +3479,6 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
{

	struct ieee80211_hw *hw;

	struct mwl8k_priv *priv;

	DECLARE_MAC_BUF(mac);

	int rc;

	int i;

	u8 *fw;
@@ -3669,8 +3667,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
		MWL8K_DESC);

	printk(KERN_INFO "%s: Driver Ver:%s  Firmware Ver:%u.%u.%u.%u\n",

		priv->name, MWL8K_VERSION, fw[3], fw[2], fw[1], fw[0]);

	printk(KERN_INFO "%s: MAC Address: %s\n", priv->name,

	       print_mac(mac, hw->wiphy->perm_addr));

	printk(KERN_INFO "%s: MAC Address: %pM\n", priv->name,

		hw->wiphy->perm_addr);



	return 0;