net: wireless: bcm4329: Fix roaming message processing

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcm4329/wl_iw.c b/drivers/net/wireless/bcm4329/wl_iw.c
index fe4afa9c6d3d09bc319464431d30d2fe4004b429..434e584f830c2c6b5972a749afac356aac26c3fa 100644 (file)
--- a/drivers/net/wireless/bcm4329/wl_iw.c
+++ b/drivers/net/wireless/bcm4329/wl_iw.c
@@ -7864,9 +7864,12 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
                break;
        case WLC_E_ROAM:
                if (status == WLC_E_STATUS_SUCCESS) {
-                       memcpy(wrqu.addr.sa_data, &e->addr.octet, ETHER_ADDR_LEN);
-                       wrqu.addr.sa_family = ARPHRD_ETHER;
-                       cmd = SIOCGIWAP;
+                       WL_ASSOC(("%s: WLC_E_ROAM: success\n", __FUNCTION__));
+#if defined(ROAM_NOT_USED)
+                       roam_no_success_send = FALSE;
+                       roam_no_success = 0;
+#endif
+                       goto wl_iw_event_end;
                }
 #if defined(ROAM_NOT_USED)
                else if (status == WLC_E_STATUS_NO_NETWORKS) {
@@ -8070,7 +8073,6 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
 #endif
 
 #if WIRELESS_EXT > 14
-       
        memset(extra, 0, sizeof(extra));
        if (wl_iw_check_conn_fail(e, extra, sizeof(extra))) {
                cmd = IWEVCUSTOM;