diff options
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
| -rw-r--r-- | net/mac80211/mesh_pathtbl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 0192cfdacae4..2312efe04c62 100644 --- 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) | |||
| 260 | int err = 0; | 260 | int err = 0; |
| 261 | u32 hash_idx; | 261 | u32 hash_idx; |
| 262 | 262 | ||
| 263 | if (memcmp(dst, sdata->dev->dev_addr, ETH_ALEN) == 0) | 263 | if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0) |
| 264 | /* never add ourselves as neighbours */ | 264 | /* never add ourselves as neighbours */ |
| 265 | return -ENOTSUPP; | 265 | return -ENOTSUPP; |
| 266 | 266 | ||
| @@ -377,7 +377,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata) | |||
| 377 | int err = 0; | 377 | int err = 0; |
| 378 | u32 hash_idx; | 378 | u32 hash_idx; |
| 379 | 379 | ||
| 380 | if (memcmp(dst, sdata->dev->dev_addr, ETH_ALEN) == 0) | 380 | if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0) |
| 381 | /* never add ourselves as neighbours */ | 381 | /* never add ourselves as neighbours */ |
| 382 | return -ENOTSUPP; | 382 | return -ENOTSUPP; |
| 383 | 383 | ||
| @@ -605,7 +605,7 @@ void mesh_path_discard_frame(struct sk_buff *skb, | |||
| 605 | struct mesh_path *mpath; | 605 | struct mesh_path *mpath; |
| 606 | u32 sn = 0; | 606 | u32 sn = 0; |
| 607 | 607 | ||
| 608 | if (memcmp(hdr->addr4, sdata->dev->dev_addr, ETH_ALEN) != 0) { | 608 | if (memcmp(hdr->addr4, sdata->vif.addr, ETH_ALEN) != 0) { |
| 609 | u8 *ra, *da; | 609 | u8 *ra, *da; |
| 610 | 610 | ||
| 611 | da = hdr->addr3; | 611 | da = hdr->addr3; |
