openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NET]: Undo code bloat in hot paths due to print_mac(). 

If print_mac() is used inside of a pr_debug() the compiler
can't see that the call is redundant so still performs it
even of pr_debug() ends up being a nop.

So don't use print_mac() in such cases in hot code paths,
use MAC_FMT et al. instead.

As noted by Joe Perches, pr_debug() could be modified to
handle this better, but that is a change to an interface
used by the entire kernel and thus needs to be validated
carefully.  This here is thus the less risky fix for
2.6.25

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-04-08 16:50:44 -07:00
parent 6adb4f733e
commit 21f644f3ea
9 changed files with 225 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/starfire.c
View File

@ -1472,13 +1472,12 @@ static int __netdev_rx(struct net_device *dev, int *quota)
#ifndef final_version /* Remove after testing. */ #ifndef final_version /* Remove after testing. */
/* You will want this info for the initial debug. */ /* You will want this info for the initial debug. */
if (debug > 5) { if (debug > 5) {
DECLARE_MAC_BUF(mac); printk(KERN_DEBUG " Rx data " MAC_FMT " " MAC_FMT
DECLARE_MAC_BUF(mac2);
printk(KERN_DEBUG " Rx data %s %s"
" %2.2x%2.2x.\n", " %2.2x%2.2x.\n",
print_mac(mac, &skb->data[0]), skb->data[0], skb->data[1], skb->data[2],
print_mac(mac2, &skb->data[6]), skb->data[3], skb->data[4], skb->data[5],
skb->data[6], skb->data[7], skb->data[8],
skb->data[9], skb->data[10], skb->data[11],
skb->data[12], skb->data[13]); skb->data[12], skb->data[13]);
} }
#endif #endif

15
drivers/net/tokenring/olympic.c
View File

@ -1438,13 +1438,18 @@ static void olympic_arb_cmd(struct net_device *dev)
if (olympic_priv->olympic_network_monitor) { if (olympic_priv->olympic_network_monitor) {
struct trh_hdr *mac_hdr; struct trh_hdr *mac_hdr;
DECLARE_MAC_BUF(mac);
printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name); printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);
mac_hdr = tr_hdr(mac_frame); mac_hdr = tr_hdr(mac_frame);
printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %s\n", printk(KERN_WARNING "%s: MAC Frame Dest. Addr: "
dev->name, print_mac(mac, mac_hdr->daddr)); MAC_FMT " \n", dev->name,
printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %s\n", mac_hdr->daddr[0], mac_hdr->daddr[1],
dev->name, print_mac(mac, mac_hdr->saddr)); mac_hdr->daddr[2], mac_hdr->daddr[3],
mac_hdr->daddr[4], mac_hdr->daddr[5]);
printk(KERN_WARNING "%s: MAC Frame Srce. Addr: "
MAC_FMT " \n", dev->name,
mac_hdr->saddr[0], mac_hdr->saddr[1],
mac_hdr->saddr[2], mac_hdr->saddr[3],
mac_hdr->saddr[4], mac_hdr->saddr[5]);
} }
netif_rx(mac_frame); netif_rx(mac_frame);
dev->last_rx = jiffies; dev->last_rx = jiffies;

5
drivers/net/virtio_net.c
View File

@ -234,11 +234,12 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev)
struct scatterlist sg[1+MAX_SKB_FRAGS]; struct scatterlist sg[1+MAX_SKB_FRAGS];
struct virtio_net_hdr *hdr; struct virtio_net_hdr *hdr;
const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
DECLARE_MAC_BUF(mac);
sg_init_table(sg, 1+MAX_SKB_FRAGS); sg_init_table(sg, 1+MAX_SKB_FRAGS);
pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest)); pr_debug("%s: xmit %p " MAC_FMT "\n", dev->name, skb,
dest[0], dest[1], dest[2],
dest[3], dest[4], dest[5]);
/* Encode metadata header at front. */ /* Encode metadata header at front. */
hdr = skb_vnet_hdr(skb); hdr = skb_vnet_hdr(skb);

39
drivers/net/wireless/hostap/hostap_80211_rx.c
View File

@ -635,7 +635,6 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
{ {
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
int res, hdrlen; int res, hdrlen;
DECLARE_MAC_BUF(mac);
if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
return 0; return 0;
@ -647,8 +646,10 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
strcmp(crypt->ops->name, "TKIP") == 0) { strcmp(crypt->ops->name, "TKIP") == 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"received packet from %s\n", "received packet from " MAC_FMT "\n",
local->dev->name, print_mac(mac, hdr->addr2)); local->dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
} }
return -1; return -1;
} }
@ -657,9 +658,12 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
printk(KERN_DEBUG "%s: decryption failed (SA=%s" printk(KERN_DEBUG "%s: decryption failed (SA=" MAC_FMT
") res=%d\n", ") res=%d\n",
local->dev->name, print_mac(mac, hdr->addr2), res); local->dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
res);
local->comm_tallies.rx_discards_wep_undecryptable++; local->comm_tallies.rx_discards_wep_undecryptable++;
return -1; return -1;
} }
@ -721,7 +725,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
struct ieee80211_crypt_data *crypt = NULL; struct ieee80211_crypt_data *crypt = NULL;
void *sta = NULL; void *sta = NULL;
int keyidx = 0; int keyidx = 0;
DECLARE_MAC_BUF(mac);
iface = netdev_priv(dev); iface = netdev_priv(dev);
local = iface->local; local = iface->local;
@ -798,8 +801,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
* frames silently instead of filling system log with * frames silently instead of filling system log with
* these reports. */ * these reports. */
printk(KERN_DEBUG "%s: WEP decryption failed (not set)" printk(KERN_DEBUG "%s: WEP decryption failed (not set)"
" (SA=%s)\n", " (SA=" MAC_FMT ")\n",
local->dev->name, print_mac(mac, hdr->addr2)); local->dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
#endif #endif
local->comm_tallies.rx_discards_wep_undecryptable++; local->comm_tallies.rx_discards_wep_undecryptable++;
goto rx_dropped; goto rx_dropped;
@ -813,8 +818,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
(keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
{ {
printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
"from %s\n", dev->name, "from " MAC_FMT "\n", dev->name,
print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
/* TODO: could inform hostapd about this so that it /* TODO: could inform hostapd about this so that it
* could send auth failure report */ * could send auth failure report */
goto rx_dropped; goto rx_dropped;
@ -982,8 +988,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
"unencrypted EAPOL frame\n", local->dev->name); "unencrypted EAPOL frame\n", local->dev->name);
} else { } else {
printk(KERN_DEBUG "%s: encryption configured, but RX " printk(KERN_DEBUG "%s: encryption configured, but RX "
"frame not encrypted (SA=%s)\n", "frame not encrypted (SA=" MAC_FMT ")\n",
local->dev->name, print_mac(mac, hdr->addr2)); local->dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
goto rx_dropped; goto rx_dropped;
} }
} }
@ -992,9 +1000,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
!hostap_is_eapol_frame(local, skb)) { !hostap_is_eapol_frame(local, skb)) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: dropped unencrypted RX data " printk(KERN_DEBUG "%s: dropped unencrypted RX data "
"frame from %s" "frame from " MAC_FMT " (drop_unencrypted=1)\n",
" (drop_unencrypted=1)\n", dev->name,
dev->name, print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
} }
goto rx_dropped; goto rx_dropped;
} }

7
drivers/net/wireless/hostap/hostap_80211_tx.c
View File

@ -314,7 +314,6 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
u16 fc; u16 fc;
int prefix_len, postfix_len, hdr_len, res; int prefix_len, postfix_len, hdr_len, res;
DECLARE_MAC_BUF(mac);
iface = netdev_priv(skb->dev); iface = netdev_priv(skb->dev);
local = iface->local; local = iface->local;
@ -329,8 +328,10 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
hdr = (struct ieee80211_hdr_4addr *) skb->data; hdr = (struct ieee80211_hdr_4addr *) skb->data;
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"TX packet to %s\n", "TX packet to " MAC_FMT "\n",
local->dev->name, print_mac(mac, hdr->addr1)); local->dev->name,
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
} }
kfree_skb(skb); kfree_skb(skb);
return NULL; return NULL;

203
drivers/net/wireless/hostap/hostap_ap.c
View File

@ -632,7 +632,6 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
__le16 *pos; __le16 *pos;
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
char *txt = NULL; char *txt = NULL;
DECLARE_MAC_BUF(mac);
if (ap->local->hostapd) { if (ap->local->hostapd) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
@ -684,10 +683,12 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
if (sta) if (sta)
atomic_dec(&sta->users); atomic_dec(&sta->users);
if (txt) { if (txt) {
PDEBUG(DEBUG_AP, "%s: %s auth_cb - alg=%d " PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth_cb - alg=%d "
"trans#=%d status=%d - %s\n", "trans#=%d status=%d - %s\n",
dev->name, print_mac(mac, hdr->addr1), auth_alg, dev->name,
auth_transaction, status, txt); hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
auth_alg, auth_transaction, status, txt);
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
@ -703,7 +704,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
__le16 *pos; __le16 *pos;
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
char *txt = NULL; char *txt = NULL;
DECLARE_MAC_BUF(mac);
if (ap->local->hostapd) { if (ap->local->hostapd) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
@ -754,8 +754,11 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
if (sta) if (sta)
atomic_dec(&sta->users); atomic_dec(&sta->users);
if (txt) { if (txt) {
PDEBUG(DEBUG_AP, "%s: %s assoc_cb - %s\n", PDEBUG(DEBUG_AP, "%s: " MAC_FMT " assoc_cb - %s\n",
dev->name, print_mac(mac, hdr->addr1), txt); dev->name,
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
txt);
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
@ -767,7 +770,6 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
struct ap_data *ap = data; struct ap_data *ap = data;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
struct sta_info *sta; struct sta_info *sta;
DECLARE_MAC_BUF(mac);
if (skb->len < 24) if (skb->len < 24)
goto fail; goto fail;
@ -779,9 +781,11 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
sta->flags &= ~WLAN_STA_PENDING_POLL; sta->flags &= ~WLAN_STA_PENDING_POLL;
spin_unlock(&ap->sta_table_lock); spin_unlock(&ap->sta_table_lock);
} else { } else {
PDEBUG(DEBUG_AP, "%s: STA %s" PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
" did not ACK activity poll frame\n", " did not ACK activity poll frame\n",
ap->local->dev->name, print_mac(mac, hdr->addr1)); ap->local->dev->name,
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
} }
fail: fail:
@ -1306,7 +1310,6 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
struct ieee80211_crypt_data *crypt; struct ieee80211_crypt_data *crypt;
char *txt = ""; char *txt = "";
DECLARE_MAC_BUF(mac);
len = skb->len - IEEE80211_MGMT_HDR_LEN; len = skb->len - IEEE80211_MGMT_HDR_LEN;
@ -1315,8 +1318,9 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
if (len < 6) { if (len < 6) {
PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload " PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "
"(len=%d) from %s\n", dev->name, len, "(len=%d) from " MAC_FMT "\n", dev->name, len,
print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
return; return;
} }
@ -1381,8 +1385,10 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
if (time_after(jiffies, sta->u.ap.last_beacon + if (time_after(jiffies, sta->u.ap.last_beacon +
(10 * sta->listen_interval * HZ) / 1024)) { (10 * sta->listen_interval * HZ) / 1024)) {
PDEBUG(DEBUG_AP, "%s: no beacons received for a while," PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"
" assuming AP %s is now STA\n", " assuming AP " MAC_FMT " is now STA\n",
dev->name, print_mac(mac, sta->addr)); dev->name,
sta->addr[0], sta->addr[1], sta->addr[2],
sta->addr[3], sta->addr[4], sta->addr[5]);
sta->ap = 0; sta->ap = 0;
sta->flags = 0; sta->flags = 0;
sta->u.sta.challenge = NULL; sta->u.sta.challenge = NULL;
@ -1497,10 +1503,13 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
} }
if (resp) { if (resp) {
PDEBUG(DEBUG_AP, "%s: %s auth (alg=%d " PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth (alg=%d "
"trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n", "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n",
dev->name, print_mac(mac, hdr->addr2), auth_alg, dev->name,
auth_transaction, status_code, len, fc, resp, txt); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
auth_alg, auth_transaction, status_code, len,
fc, resp, txt);
} }
} }
@ -1519,14 +1528,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
int send_deauth = 0; int send_deauth = 0;
char *txt = ""; char *txt = "";
u8 prev_ap[ETH_ALEN]; u8 prev_ap[ETH_ALEN];
DECLARE_MAC_BUF(mac);
left = len = skb->len - IEEE80211_MGMT_HDR_LEN; left = len = skb->len - IEEE80211_MGMT_HDR_LEN;
if (len < (reassoc ? 10 : 4)) { if (len < (reassoc ? 10 : 4)) {
PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload " PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "
"(len=%d, reassoc=%d) from %s\n", "(len=%d, reassoc=%d) from " MAC_FMT "\n",
dev->name, len, reassoc, print_mac(mac, hdr->addr2)); dev->name, len, reassoc,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
return; return;
} }
@ -1603,9 +1613,12 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
} }
if (left > 0) { if (left > 0) {
PDEBUG(DEBUG_AP, "%s: assoc from %s" PDEBUG(DEBUG_AP, "%s: assoc from " MAC_FMT
" with extra data (%d bytes) [", " with extra data (%d bytes) [",
dev->name, print_mac(mac, hdr->addr2), left); dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
left);
while (left > 0) { while (left > 0) {
PDEBUG2(DEBUG_AP, "<%02x>", *u); PDEBUG2(DEBUG_AP, "<%02x>", *u);
u++; left--; u++; left--;
@ -1704,10 +1717,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
} }
#if 0 #if 0
PDEBUG(DEBUG_AP, "%s: %s %sassoc (len=%d " PDEBUG(DEBUG_AP, "%s: " MAC_FMT" %sassoc (len=%d "
"prev_ap=%s) => %d(%d) (%s)\n", "prev_ap=" MAC_FMT") => %d(%d) (%s)\n",
dev->name, print_mac(mac, hdr->addr2), reassoc ? "re" : "", len, dev->name,
print_mac(mac, prev_ap), resp, send_deauth, txt); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
reassoc ? "re" : "", len,
prev_ap[0], prev_ap[1], prev_ap[2],
prev_ap[3], prev_ap[4], prev_ap[5],
resp, send_deauth, txt);
#endif #endif
} }
@ -1735,9 +1753,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
pos = (__le16 *) body; pos = (__le16 *) body;
reason_code = le16_to_cpu(*pos); reason_code = le16_to_cpu(*pos);
PDEBUG(DEBUG_AP, "%s: deauthentication: %s len=%d, " PDEBUG(DEBUG_AP, "%s: deauthentication: " MAC_FMT " len=%d, "
"reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len, "reason_code=%d\n", dev->name,
reason_code); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
len, reason_code);
spin_lock_bh(&local->ap->sta_table_lock); spin_lock_bh(&local->ap->sta_table_lock);
sta = ap_get_sta(local->ap, hdr->addr2); sta = ap_get_sta(local->ap, hdr->addr2);
@ -1748,9 +1768,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
} }
spin_unlock_bh(&local->ap->sta_table_lock); spin_unlock_bh(&local->ap->sta_table_lock);
if (sta == NULL) { if (sta == NULL) {
printk("%s: deauthentication from %s, " printk("%s: deauthentication from " MAC_FMT ", "
"reason_code=%d, but STA not authenticated\n", dev->name, "reason_code=%d, but STA not authenticated\n", dev->name,
print_mac(mac, hdr->addr2), reason_code); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
reason_code);
} }
} }
@ -1766,7 +1788,6 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
u16 reason_code; u16 reason_code;
__le16 *pos; __le16 *pos;
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
DECLARE_MAC_BUF(mac);
len = skb->len - IEEE80211_MGMT_HDR_LEN; len = skb->len - IEEE80211_MGMT_HDR_LEN;
@ -1778,9 +1799,11 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
pos = (__le16 *) body; pos = (__le16 *) body;
reason_code = le16_to_cpu(*pos); reason_code = le16_to_cpu(*pos);
PDEBUG(DEBUG_AP, "%s: disassociation: %s len=%d, " PDEBUG(DEBUG_AP, "%s: disassociation: " MAC_FMT " len=%d, "
"reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len, "reason_code=%d\n", dev->name,
reason_code); hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
len, reason_code);
spin_lock_bh(&local->ap->sta_table_lock); spin_lock_bh(&local->ap->sta_table_lock);
sta = ap_get_sta(local->ap, hdr->addr2); sta = ap_get_sta(local->ap, hdr->addr2);
@ -1791,9 +1814,12 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
} }
spin_unlock_bh(&local->ap->sta_table_lock); spin_unlock_bh(&local->ap->sta_table_lock);
if (sta == NULL) { if (sta == NULL) {
printk("%s: disassociation from %s, " printk("%s: disassociation from " MAC_FMT ", "
"reason_code=%d, but STA not authenticated\n", "reason_code=%d, but STA not authenticated\n",
dev->name, print_mac(mac, hdr->addr2), reason_code); dev->name,
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
reason_code);
} }
} }
@ -1882,16 +1908,20 @@ static void handle_pspoll(local_info_t *local,
struct sta_info *sta; struct sta_info *sta;
u16 aid; u16 aid;
struct sk_buff *skb; struct sk_buff *skb;
DECLARE_MAC_BUF(mac);
PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%s" PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MAC_FMT
", TA=%s PWRMGT=%d\n", ", TA=" MAC_FMT " PWRMGT=%d\n",
print_mac(mac, hdr->addr1), print_mac(mac, hdr->addr2), hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
!!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM)); !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM));
if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=%s" PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MAC_FMT
" not own MAC\n", print_mac(mac, hdr->addr1)); " not own MAC\n",
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
return; return;
} }
@ -1969,7 +1999,6 @@ static void handle_wds_oper_queue(struct work_struct *work)
wds_oper_queue); wds_oper_queue);
local_info_t *local = ap->local; local_info_t *local = ap->local;
struct wds_oper_data *entry, *prev; struct wds_oper_data *entry, *prev;
DECLARE_MAC_BUF(mac);
spin_lock_bh(&local->lock); spin_lock_bh(&local->lock);
entry = local->ap->wds_oper_entries; entry = local->ap->wds_oper_entries;
@ -1978,10 +2007,11 @@ static void handle_wds_oper_queue(struct work_struct *work)
while (entry) { while (entry) {
PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection " PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "
"to AP %s\n", "to AP " MAC_FMT "\n",
local->dev->name, local->dev->name,
entry->type == WDS_ADD ? "adding" : "removing", entry->type == WDS_ADD ? "adding" : "removing",
print_mac(mac, entry->addr)); entry->addr[0], entry->addr[1], entry->addr[2],
entry->addr[3], entry->addr[4], entry->addr[5]);
if (entry->type == WDS_ADD) if (entry->type == WDS_ADD)
prism2_wds_add(local, entry->addr, 0); prism2_wds_add(local, entry->addr, 0);
else if (entry->type == WDS_DEL) else if (entry->type == WDS_DEL)
@ -2158,7 +2188,6 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
u16 fc, type, stype; u16 fc, type, stype;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
DECLARE_MAC_BUF(mac);
/* FIX: should give skb->len to handler functions and check that the /* FIX: should give skb->len to handler functions and check that the
* buffer is long enough */ * buffer is long enough */
@ -2187,8 +2216,9 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)=" PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)="
"%s not own MAC\n", MAC_FMT " not own MAC\n",
print_mac(mac, hdr->addr1)); hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
goto done; goto done;
} }
@ -2224,14 +2254,18 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
} }
if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) { if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%s" PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MAC_FMT
" not own MAC\n", print_mac(mac, hdr->addr1)); " not own MAC\n",
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
goto done; goto done;
} }
if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) { if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) {
PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%s" PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MAC_FMT
" not own MAC\n", print_mac(mac, hdr->addr3)); " not own MAC\n",
hdr->addr3[0], hdr->addr3[1], hdr->addr3[2],
hdr->addr3[3], hdr->addr3[4], hdr->addr3[5]);
goto done; goto done;
} }
@ -2312,7 +2346,6 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
struct sk_buff *skb; struct sk_buff *skb;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
struct hostap_80211_rx_status rx_stats; struct hostap_80211_rx_status rx_stats;
DECLARE_MAC_BUF(mac);
if (skb_queue_empty(&sta->tx_buf)) if (skb_queue_empty(&sta->tx_buf))
return; return;
@ -2334,7 +2367,9 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14)); hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14));
PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA " PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA "
"%s\n", local->dev->name, print_mac(mac, sta->addr)); MAC_FMT "\n", local->dev->name,
sta->addr[0], sta->addr[1], sta->addr[2],
sta->addr[3], sta->addr[4], sta->addr[5]);
skb->dev = local->dev; skb->dev = local->dev;
@ -2661,7 +2696,6 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
int ret = sta->tx_rate; int ret = sta->tx_rate;
struct hostap_interface *iface; struct hostap_interface *iface;
local_info_t *local; local_info_t *local;
DECLARE_MAC_BUF(mac);
iface = netdev_priv(dev); iface = netdev_priv(dev);
local = iface->local; local = iface->local;
@ -2689,9 +2723,12 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
case 3: sta->tx_rate = 110; break; case 3: sta->tx_rate = 110; break;
default: sta->tx_rate = 0; break; default: sta->tx_rate = 0; break;
} }
PDEBUG(DEBUG_AP, "%s: STA %s" PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
" TX rate raised to %d\n", " TX rate raised to %d\n",
dev->name, print_mac(mac, sta->addr), sta->tx_rate); dev->name,
sta->addr[0], sta->addr[1], sta->addr[2],
sta->addr[3], sta->addr[4], sta->addr[5],
sta->tx_rate);
} }
sta->tx_since_last_failure = 0; sta->tx_since_last_failure = 0;
} }
@ -2709,7 +2746,6 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
int set_tim, ret; int set_tim, ret;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
struct hostap_skb_tx_data *meta; struct hostap_skb_tx_data *meta;
DECLARE_MAC_BUF(mac);
meta = (struct hostap_skb_tx_data *) skb->cb; meta = (struct hostap_skb_tx_data *) skb->cb;
ret = AP_TX_CONTINUE; ret = AP_TX_CONTINUE;
@ -2745,8 +2781,9 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
* print out any errors here. */ * print out any errors here. */
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "AP: drop packet to non-associated " printk(KERN_DEBUG "AP: drop packet to non-associated "
"STA %s\n", "STA " MAC_FMT "\n",
print_mac(mac, hdr->addr1)); hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
} }
#endif #endif
local->ap->tx_drop_nonassoc++; local->ap->tx_drop_nonassoc++;
@ -2784,9 +2821,11 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
} }
if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) { if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) {
PDEBUG(DEBUG_PS, "%s: No more space in STA (%s" PDEBUG(DEBUG_PS, "%s: No more space in STA (" MAC_FMT
")'s PS mode buffer\n", ")'s PS mode buffer\n",
local->dev->name, print_mac(mac, sta->addr)); local->dev->name,
sta->addr[0], sta->addr[1], sta->addr[2],
sta->addr[3], sta->addr[4], sta->addr[5]);
/* Make sure that TIM is set for the station (it might not be /* Make sure that TIM is set for the station (it might not be
* after AP wlan hw reset). */ * after AP wlan hw reset). */
/* FIX: should fix hw reset to restore bits based on STA /* FIX: should fix hw reset to restore bits based on STA
@ -2850,7 +2889,6 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
struct sta_info *sta; struct sta_info *sta;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
struct hostap_skb_tx_data *meta; struct hostap_skb_tx_data *meta;
DECLARE_MAC_BUF(mac);
hdr = (struct ieee80211_hdr_4addr *) skb->data; hdr = (struct ieee80211_hdr_4addr *) skb->data;
meta = (struct hostap_skb_tx_data *) skb->cb; meta = (struct hostap_skb_tx_data *) skb->cb;
@ -2859,9 +2897,12 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
sta = ap_get_sta(local->ap, hdr->addr1); sta = ap_get_sta(local->ap, hdr->addr1);
if (!sta) { if (!sta) {
spin_unlock(&local->ap->sta_table_lock); spin_unlock(&local->ap->sta_table_lock);
PDEBUG(DEBUG_AP, "%s: Could not find STA %s" PDEBUG(DEBUG_AP, "%s: Could not find STA " MAC_FMT
" for this TX error (@%lu)\n", " for this TX error (@%lu)\n",
local->dev->name, print_mac(mac, hdr->addr1), jiffies); local->dev->name,
hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
jiffies);
return; return;
} }
@ -2888,9 +2929,11 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
case 3: sta->tx_rate = 110; break; case 3: sta->tx_rate = 110; break;
default: sta->tx_rate = 0; break; default: sta->tx_rate = 0; break;
} }
PDEBUG(DEBUG_AP, "%s: STA %s" PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
" TX rate lowered to %d\n", " TX rate lowered to %d\n",
local->dev->name, print_mac(mac, sta->addr), local->dev->name,
sta->addr[0], sta->addr[1], sta->addr[2],
sta->addr[3], sta->addr[4], sta->addr[5],
sta->tx_rate); sta->tx_rate);
} }
sta->tx_consecutive_exc = 0; sta->tx_consecutive_exc = 0;
@ -2956,7 +2999,6 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
struct sta_info *sta; struct sta_info *sta;
u16 fc, type, stype; u16 fc, type, stype;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
DECLARE_MAC_BUF(mac);
if (local->ap == NULL) if (local->ap == NULL)
return AP_RX_CONTINUE; return AP_RX_CONTINUE;
@ -2988,9 +3030,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
} else { } else {
printk(KERN_DEBUG "%s: dropped received packet" printk(KERN_DEBUG "%s: dropped received packet"
" from non-associated STA " " from non-associated STA "
"%s" MAC_FMT
" (type=0x%02x, subtype=0x%02x)\n", " (type=0x%02x, subtype=0x%02x)\n",
dev->name, print_mac(mac, hdr->addr2), dev->name,
hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5],
type >> 2, stype >> 4); type >> 2, stype >> 4);
hostap_rx(dev, skb, rx_stats); hostap_rx(dev, skb, rx_stats);
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
@ -3025,8 +3070,11 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
* being associated. */ * being associated. */
printk(KERN_DEBUG "%s: rejected received nullfunc " printk(KERN_DEBUG "%s: rejected received nullfunc "
"frame without ToDS from not associated STA " "frame without ToDS from not associated STA "
"%s\n", MAC_FMT "\n",
dev->name, print_mac(mac, hdr->addr2)); dev->name,
hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5]);
hostap_rx(dev, skb, rx_stats); hostap_rx(dev, skb, rx_stats);
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
} }
@ -3043,9 +3091,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
* If BSSID is own, report the dropping of this frame. */ * If BSSID is own, report the dropping of this frame. */
if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) { if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
printk(KERN_DEBUG "%s: dropped received packet from " printk(KERN_DEBUG "%s: dropped received packet from "
"%s with no ToDS flag " MAC_FMT " with no ToDS flag "
"(type=0x%02x, subtype=0x%02x)\n", dev->name, "(type=0x%02x, subtype=0x%02x)\n", dev->name,
print_mac(mac, hdr->addr2), type >> 2, stype >> 4); hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5],
type >> 2, stype >> 4);
hostap_dump_rx_80211(dev->name, skb, rx_stats); hostap_dump_rx_80211(dev->name, skb, rx_stats);
} }
ret = AP_RX_DROP; ret = AP_RX_DROP;

7
drivers/net/wireless/ipw2200.c
View File

@ -10192,7 +10192,6 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
u8 id, hdr_len, unicast; u8 id, hdr_len, unicast;
u16 remaining_bytes; u16 remaining_bytes;
int fc; int fc;
DECLARE_MAC_BUF(mac);
hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
switch (priv->ieee->iw_mode) { switch (priv->ieee->iw_mode) {
@ -10203,8 +10202,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
id = ipw_add_station(priv, hdr->addr1); id = ipw_add_station(priv, hdr->addr1);
if (id == IPW_INVALID_STATION) { if (id == IPW_INVALID_STATION) {
IPW_WARNING("Attempt to send data to " IPW_WARNING("Attempt to send data to "
"invalid cell: %s\n", "invalid cell: " MAC_FMT "\n",
print_mac(mac, hdr->addr1)); hdr->addr1[0], hdr->addr1[1],
hdr->addr1[2], hdr->addr1[3],
hdr->addr1[4], hdr->addr1[5]);
goto drop; goto drop;
} }
} }

29
net/atm/lec.c
View File

@ -266,7 +266,6 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
char buf[300]; char buf[300];
int i = 0; int i = 0;
#endif /* DUMP_PACKETS >0 */ #endif /* DUMP_PACKETS >0 */
DECLARE_MAC_BUF(mac);
pr_debug("lec_start_xmit called\n"); pr_debug("lec_start_xmit called\n");
if (!priv->lecd) { if (!priv->lecd) {
@ -374,15 +373,19 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
pr_debug("%s:lec_start_xmit: queuing packet, ", pr_debug("%s:lec_start_xmit: queuing packet, ",
dev->name); dev->name);
pr_debug("MAC address %s\n", pr_debug("MAC address " MAC_FMT "\n",
print_mac(mac, lec_h->h_dest)); lec_h->h_dest[0], lec_h->h_dest[1],
lec_h->h_dest[2], lec_h->h_dest[3],
lec_h->h_dest[4], lec_h->h_dest[5]);
skb_queue_tail(&entry->tx_wait, skb); skb_queue_tail(&entry->tx_wait, skb);
} else { } else {
pr_debug pr_debug
("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ",
dev->name); dev->name);
pr_debug("MAC address %s\n", pr_debug("MAC address " MAC_FMT "\n",
print_mac(mac, lec_h->h_dest)); lec_h->h_dest[0], lec_h->h_dest[1],
lec_h->h_dest[2], lec_h->h_dest[3],
lec_h->h_dest[4], lec_h->h_dest[5]);
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
@ -394,8 +397,10 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
pr_debug("lec.c: emptying tx queue, "); pr_debug("lec.c: emptying tx queue, ");
pr_debug("MAC address %s\n", pr_debug("MAC address " MAC_FMT "\n",
print_mac(mac, lec_h->h_dest)); lec_h->h_dest[0], lec_h->h_dest[1],
lec_h->h_dest[2], lec_h->h_dest[3],
lec_h->h_dest[4], lec_h->h_dest[5]);
lec_send(vcc, skb2, priv); lec_send(vcc, skb2, priv);
} }
@ -449,7 +454,6 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
struct lec_arp_table *entry; struct lec_arp_table *entry;
int i; int i;
char *tmp; /* FIXME */ char *tmp; /* FIXME */
DECLARE_MAC_BUF(mac);
atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
mesg = (struct atmlec_msg *)skb->data; mesg = (struct atmlec_msg *)skb->data;
@ -536,9 +540,14 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
struct net_bridge_fdb_entry *f; struct net_bridge_fdb_entry *f;
pr_debug pr_debug
("%s: bridge zeppelin asks about %s\n", ("%s: bridge zeppelin asks about " MAC_FMT "\n",
dev->name, dev->name,
print_mac(mac, mesg->content.proxy.mac_addr)); mesg->content.proxy.mac_addr[0],
mesg->content.proxy.mac_addr[1],
mesg->content.proxy.mac_addr[2],
mesg->content.proxy.mac_addr[3],
mesg->content.proxy.mac_addr[4],
mesg->content.proxy.mac_addr[5]);
if (br_fdb_get_hook == NULL || dev->br_port == NULL) if (br_fdb_get_hook == NULL || dev->br_port == NULL)
break; break;

43
net/ieee80211/ieee80211_rx.c
View File

@ -271,7 +271,6 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
{ {
struct ieee80211_hdr_3addr *hdr; struct ieee80211_hdr_3addr *hdr;
int res, hdrlen; int res, hdrlen;
DECLARE_MAC_BUF(mac);
if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
return 0; return 0;
@ -283,8 +282,12 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
IEEE80211_DEBUG_DROP("decryption failed (SA=%s" IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT
") res=%d\n", print_mac(mac, hdr->addr2), res); ") res=%d\n",
hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5],
res);
if (res == -2) if (res == -2)
IEEE80211_DEBUG_DROP("Decryption failed ICV " IEEE80211_DEBUG_DROP("Decryption failed ICV "
"mismatch (key %d)\n", "mismatch (key %d)\n",
@ -304,7 +307,6 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
{ {
struct ieee80211_hdr_3addr *hdr; struct ieee80211_hdr_3addr *hdr;
int res, hdrlen; int res, hdrlen;
DECLARE_MAC_BUF(mac);
if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
return 0; return 0;
@ -317,8 +319,12 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
" (SA=%s keyidx=%d)\n", " (SA=" MAC_FMT " keyidx=%d)\n",
ieee->dev->name, print_mac(mac, hdr->addr2), keyidx); ieee->dev->name,
hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5],
keyidx);
return -1; return -1;
} }
@ -462,8 +468,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
* frames silently instead of filling system log with * frames silently instead of filling system log with
* these reports. */ * these reports. */
IEEE80211_DEBUG_DROP("Decryption failed (not set)" IEEE80211_DEBUG_DROP("Decryption failed (not set)"
" (SA=%s)\n", " (SA=" MAC_FMT ")\n",
print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5]);
ieee->ieee_stats.rx_discards_undecryptable++; ieee->ieee_stats.rx_discards_undecryptable++;
goto rx_dropped; goto rx_dropped;
} }
@ -474,8 +482,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt && fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
(keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) { (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) {
printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
"from %s\n", dev->name, "from " MAC_FMT "\n", dev->name,
print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5]);
/* TODO: could inform hostapd about this so that it /* TODO: could inform hostapd about this so that it
* could send auth failure report */ * could send auth failure report */
goto rx_dropped; goto rx_dropped;
@ -653,8 +663,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
* configured */ * configured */
} else { } else {
IEEE80211_DEBUG_DROP("encryption configured, but RX " IEEE80211_DEBUG_DROP("encryption configured, but RX "
"frame not encrypted (SA=%s" "frame not encrypted (SA="
")\n", print_mac(mac, hdr->addr2)); MAC_FMT ")\n",
hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5]);
goto rx_dropped; goto rx_dropped;
} }
} }
@ -662,9 +675,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
!ieee80211_is_eapol_frame(ieee, skb)) { !ieee80211_is_eapol_frame(ieee, skb)) {
IEEE80211_DEBUG_DROP("dropped unencrypted RX data " IEEE80211_DEBUG_DROP("dropped unencrypted RX data "
"frame from %s" "frame from " MAC_FMT
" (drop_unencrypted=1)\n", " (drop_unencrypted=1)\n",
print_mac(mac, hdr->addr2)); hdr->addr2[0], hdr->addr2[1],
hdr->addr2[2], hdr->addr2[3],
hdr->addr2[4], hdr->addr2[5]);
goto rx_dropped; goto rx_dropped;
} }