Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: net/ieee802154/6lowpan.c
This commit is contained in:
@@ -1468,7 +1468,7 @@ static inline int is_same_network(struct libipw_network *src,
|
||||
* as one network */
|
||||
return ((src->ssid_len == dst->ssid_len) &&
|
||||
(src->channel == dst->channel) &&
|
||||
ether_addr_equal(src->bssid, dst->bssid) &&
|
||||
ether_addr_equal_64bits(src->bssid, dst->bssid) &&
|
||||
!memcmp(src->ssid, dst->ssid, src->ssid_len));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user