summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rndis_wlan.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 08:57:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 08:58:03 -0700
commite765bf84d59257d3c4f948fbce426ea3565e83ad (patch)
treee6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 /drivers/net/wireless/rndis_wlan.c
parentafd6bb387323154ff6554b52d333ec6efb8efe61 (diff)
parent6887a4131da3adaab011613776d865f4bcfb5678 (diff)
downloadlinux-e765bf84d59257d3c4f948fbce426ea3565e83ad.tar.bz2
Merge 3.5-rc5 into usb-next
This resolves a merge issue with the option.c USB serial driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r--drivers/net/wireless/rndis_wlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 2e9e6af21362..dfcd02ab6cae 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2110,7 +2110,7 @@ resize_buf:
while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
matched) {
- if (!ether_addr_equal(bssid->mac, match_bssid))
+ if (ether_addr_equal(bssid->mac, match_bssid))
*matched = true;
}