]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
rndis_wlan: update carrier flag when link state changes
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Mon, 2 Jun 2008 15:35:29 +0000 (18:35 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 14 Jun 2008 16:17:59 +0000 (12:17 -0400)
Driver wasn't updating netif_carrier on link state changes but assumed
link layer was always up.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rndis_wlan.c

index aaeeec8039742712ff138972962aa3c2e048c37d..c281c0b35ed4de371b9cc47043913798688b5980 100644 (file)
@@ -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 @@ get_bssid:
        }
 
        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");