From 9ab98d42401d50d6ab5f6ef59e1d63c486391f1c Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 9 Jun 2014 15:16:41 +0200 Subject: [PATCH] staging: rtl8723au: cfg80211_rtw_connect(): Remove obfuscating pointers dst_ssid and dst_bssid were just obfuscating that we were in fact looking at pnetwork. Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index b0d959e4a92..281b48c590f 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -2118,8 +2118,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, struct list_head *phead, *plist, *ptmp; struct wlan_network *pnetwork = NULL; struct cfg80211_ssid ssid; - u8 *dst_ssid; - u8 *dst_bssid; /* u8 matched_by_bssid = false; */ /* u8 matched_by_ssid = false; */ u8 matched = false; @@ -2172,9 +2170,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, list_for_each_safe(plist, ptmp, phead) { pnetwork = container_of(plist, struct wlan_network, list); - dst_ssid = pnetwork->network.Ssid.ssid; - dst_bssid = pnetwork->network.MacAddress; - if (sme->bssid) { if (!ether_addr_equal(pnetwork->network.MacAddress, sme->bssid)) @@ -2189,7 +2184,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, } if (sme->bssid) { - if (ether_addr_equal(dst_bssid, sme->bssid)) { + if (ether_addr_equal(pnetwork->network.MacAddress, + sme->bssid)) { DBG_8723A("matched by bssid\n"); memcpy(ssid.ssid, pnetwork->network.Ssid.ssid, @@ -2200,7 +2196,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, break; } } else if (sme->ssid && sme->ssid_len) { - if (!memcmp(dst_ssid, sme->ssid, sme->ssid_len) && + if (!memcmp(pnetwork->network.Ssid.ssid, + sme->ssid, sme->ssid_len) && pnetwork->network.Ssid.ssid_len == sme->ssid_len) { DBG_8723A("matched by ssid\n"); -- 2.46.0