git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
net
/
mac80211
/
mesh_pathtbl.c
diff --git
a/net/mac80211/mesh_pathtbl.c
b/net/mac80211/mesh_pathtbl.c
index
0192cfd
..
2312efe
100644
(file)
--- a/
net/mac80211/mesh_pathtbl.c
+++ b/
net/mac80211/mesh_pathtbl.c
@@
-260,7
+260,7
@@
int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
int err = 0;
u32 hash_idx;
int err = 0;
u32 hash_idx;
- if (memcmp(dst, sdata->
dev->dev_
addr, ETH_ALEN) == 0)
+ if (memcmp(dst, sdata->
vif.
addr, ETH_ALEN) == 0)
/* never add ourselves as neighbours */
return -ENOTSUPP;
/* never add ourselves as neighbours */
return -ENOTSUPP;
@@
-377,7
+377,7
@@
int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
int err = 0;
u32 hash_idx;
int err = 0;
u32 hash_idx;
- if (memcmp(dst, sdata->
dev->dev_
addr, ETH_ALEN) == 0)
+ if (memcmp(dst, sdata->
vif.
addr, ETH_ALEN) == 0)
/* never add ourselves as neighbours */
return -ENOTSUPP;
/* never add ourselves as neighbours */
return -ENOTSUPP;
@@
-605,7
+605,7
@@
void mesh_path_discard_frame(struct sk_buff *skb,
struct mesh_path *mpath;
u32 sn = 0;
struct mesh_path *mpath;
u32 sn = 0;
- if (memcmp(hdr->addr4, sdata->
dev->dev_
addr, ETH_ALEN) != 0) {
+ if (memcmp(hdr->addr4, sdata->
vif.
addr, ETH_ALEN) != 0) {
u8 *ra, *da;
da = hdr->addr3;
u8 *ra, *da;
da = hdr->addr3;