diff --git a/[refs] b/[refs] index f80f542001c2..ead8f1d166fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6010ce07a66cfed043879de31275f5b90b33c4fc +refs/heads/master: 5331b96ce3a9f08d3a9e28386e193e8c78f8fdd1 diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index aaeeec803974..c281c0b35ed4 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/drivers/net/wireless/rndis_wlan.c @@ -2215,6 +2215,8 @@ static void rndis_wext_worker(struct work_struct *work) int ret, offset; if (test_and_clear_bit(WORK_LINK_UP, &priv->work_pending)) { + netif_carrier_on(usbdev->net); + info = kzalloc(assoc_size, GFP_KERNEL); if (!info) goto get_bssid; @@ -2253,6 +2255,8 @@ static void rndis_wext_worker(struct work_struct *work) } if (test_and_clear_bit(WORK_LINK_DOWN, &priv->work_pending)) { + netif_carrier_off(usbdev->net); + evt.data.flags = 0; evt.data.length = 0; memset(evt.ap_addr.sa_data, 0, ETH_ALEN); @@ -2574,6 +2578,7 @@ static int rndis_wext_bind(struct usbnet *dev, struct usb_interface *intf) /* turn radio on */ priv->radio_on = 1; disassociate(dev, 1); + netif_carrier_off(dev->net); /* because rndis_command() sleeps we need to use workqueue */ priv->workqueue = create_singlethread_workqueue("rndis_wlan");