diff options
author | Guido Guenther <agx@sigxcpu.org> | 2007-01-08 23:46:00 +0100 |
---|---|---|
committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-01-08 23:46:00 +0100 |
commit | c403f4d39f6b4c5b28dcd2ea66a6c23fdabf116a (patch) | |
tree | 1ec306b7c39c57907ad4dc23d4945b881deaae73 | |
parent | e73ec1e4437ea655ba2c05017bbb3d5135b8c73b (diff) |
start the bss-timeout timer at the very end of init_new_device
-rw-r--r-- | at76c503.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -6347,7 +6347,6 @@ static void at76c503_delete_device(struct at76c503 *dev) static int at76c503_alloc_urbs(struct at76c503 *dev) { struct usb_interface *interface = dev->interface; -// struct usb_host_interface *iface_desc = &interface->altsetting[0]; struct usb_endpoint_descriptor *endpoint; struct usb_device *udev = dev->udev; int i, buffer_size; @@ -6509,8 +6508,6 @@ static int init_new_device(struct at76c503 *dev) dbg(DBG_DEVSTART, "USB interface: %d endpoints", NUM_EP(dev->interface)); - /* we let this timer run the whole time this driver instance lives */ - mod_timer(&dev->bss_list_timer, jiffies+BSS_LIST_TIMEOUT); #ifdef CONFIG_IPAQ_HANDHELD if (machine_is_h5400 ()) @@ -6600,10 +6597,8 @@ static int init_new_device(struct at76c503 *dev) (struct iw_handler_def*)&at76c503_handler_def; netdev->set_multicast_list = at76c503_set_multicast; netdev->set_mac_address = at76c503_set_mac_address; - // netdev->hard_header_len = 8 + sizeof(struct ieee80211_hdr_3addr); - /* -// netdev->hard_header = at76c503_header; -*/ + // netdev->hard_header_len = 8 + sizeof(struct ieee80211_hdr_3addr); + // netdev->hard_header = at76c503_header; /* putting this inside rtnl_lock() - rtnl_unlock() hangs modprobe ...? */ ret = register_netdev(dev->netdev); @@ -6615,6 +6610,9 @@ static int init_new_device(struct at76c503 *dev) info("registered %s", dev->netdev->name); dev->netdev_registered = 1; + /* we let this timer run the whole time this driver instance lives */ + mod_timer(&dev->bss_list_timer, jiffies+BSS_LIST_TIMEOUT); + return 0; error: |