projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-2.6.35
[cascardo/linux.git]
/
net
/
mac80211
/
key.c
diff --git
a/net/mac80211/key.c
b/net/mac80211/key.c
index
e8f6e3b
..
8d4b417
100644
(file)
--- a/
net/mac80211/key.c
+++ b/
net/mac80211/key.c
@@
-140,6
+140,7
@@
static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
struct ieee80211_sub_if_data,
u.ap);
+ key->conf.ap_addr = sdata->dev->dev_addr;
ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
if (!ret) {