git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Staging: merge staging patches into Linus's main branch
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
rtl8187se
/
ieee80211
/
ieee80211_softmac.c
diff --git
a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index a2150670ef56c5c196d42294ea2734c3cb043c4a..c2f472ee6eb6f20cd936ac031d024cba162555df 100644
(file)
--- a/
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@
-1573,7
+1573,7
@@
ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
ieee80211_resp_to_assoc_rq(ieee, dest);
}
- printk(KERN_INFO"New client associated:
"MAC_FMT"\n", MAC_ARG(dest)
);
+ printk(KERN_INFO"New client associated:
%pM\n", dest
);
}