diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-15 11:21:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:19 -0400 |
commit | e91d83346ad9b30f44469c92b982206dcd7dcaf0 (patch) | |
tree | 31afd98edac6bf9b9b8fd8685ef2d7c89f044078 /drivers/net/wireless/libertas | |
parent | 04dc882d601ec6fae5dfcb47c43f7af343e9a135 (diff) |
wireless: remove print_mac uses
Use %pM instead, and also remove stray variables
declared with DECLARE_MAC_BUF.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index fbf26499c9a9..385b50f4b105 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c | |||
@@ -129,7 +129,6 @@ static int lbs_set_authentication(struct lbs_private *priv, u8 bssid[6], u8 auth | |||
129 | { | 129 | { |
130 | struct cmd_ds_802_11_authenticate cmd; | 130 | struct cmd_ds_802_11_authenticate cmd; |
131 | int ret = -1; | 131 | int ret = -1; |
132 | DECLARE_MAC_BUF(mac); | ||
133 | 132 | ||
134 | lbs_deb_enter(LBS_DEB_JOIN); | 133 | lbs_deb_enter(LBS_DEB_JOIN); |
135 | 134 | ||
@@ -138,8 +137,7 @@ static int lbs_set_authentication(struct lbs_private *priv, u8 bssid[6], u8 auth | |||
138 | 137 | ||
139 | cmd.authtype = iw_auth_to_ieee_auth(auth); | 138 | cmd.authtype = iw_auth_to_ieee_auth(auth); |
140 | 139 | ||
141 | lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n", | 140 | lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n", bssid, cmd.authtype); |
142 | print_mac(mac, bssid), cmd.authtype); | ||
143 | 141 | ||
144 | ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd); | 142 | ret = lbs_cmd_with_response(priv, CMD_802_11_AUTHENTICATE, &cmd); |
145 | 143 | ||
@@ -342,8 +340,6 @@ static int lbs_associate(struct lbs_private *priv, | |||
342 | 340 | ||
343 | /* Firmware v9+ indicate authentication suites as a TLV */ | 341 | /* Firmware v9+ indicate authentication suites as a TLV */ |
344 | if (priv->fwrelease >= 0x09000000) { | 342 | if (priv->fwrelease >= 0x09000000) { |
345 | DECLARE_MAC_BUF(mac); | ||
346 | |||
347 | auth = (struct mrvl_ie_auth_type *) pos; | 343 | auth = (struct mrvl_ie_auth_type *) pos; |
348 | auth->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE); | 344 | auth->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE); |
349 | auth->header.len = cpu_to_le16(2); | 345 | auth->header.len = cpu_to_le16(2); |
@@ -351,8 +347,8 @@ static int lbs_associate(struct lbs_private *priv, | |||
351 | auth->auth = cpu_to_le16(tmpauth); | 347 | auth->auth = cpu_to_le16(tmpauth); |
352 | pos += sizeof(auth->header) + 2; | 348 | pos += sizeof(auth->header) + 2; |
353 | 349 | ||
354 | lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n", | 350 | lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n", |
355 | print_mac(mac, bss->bssid), priv->secinfo.auth_mode); | 351 | bss->bssid, priv->secinfo.auth_mode); |
356 | } | 352 | } |
357 | 353 | ||
358 | /* WPA/WPA2 IEs */ | 354 | /* WPA/WPA2 IEs */ |