diff options
-rw-r--r-- | at76_usb.c | 51 | ||||
-rw-r--r-- | at76_usb.h | 1 |
2 files changed, 25 insertions, 27 deletions
@@ -200,7 +200,7 @@ static int disassoc_req(struct at76c503 *dev, struct bss_info *bss); static int assoc_req(struct at76c503 *dev, struct bss_info *bss); static int reassoc_req(struct at76c503 *dev, struct bss_info *curr, struct bss_info *new); -static void dump_bss_table(struct at76c503 *dev, int force_output); +static void dump_bss_table(struct at76c503 *dev); static int submit_rx_urb(struct at76c503 *dev); static int startup_device(struct at76c503 *dev); static int set_iroaming(struct at76c503 *dev, int onoff); @@ -1656,7 +1656,8 @@ static void handle_mgmt_timeout_scan(struct at76c503 *dev) dev->istate, dev->scan_runs); if (status == CMD_STATUS_COMPLETE) { if (dev->istate == SCANNING) { - dump_bss_table(dev, 0); + if (at76_debug & DBG_BSS_TABLE) + dump_bss_table(dev); switch (dev->scan_runs) { case 1: @@ -2648,38 +2649,36 @@ static inline int bssid_matched(struct at76c503 *dev, struct bss_info *ptr) } } -static void dump_bss_table(struct at76c503 *dev, int force_output) +static void dump_bss_table(struct at76c503 *dev) { struct bss_info *ptr; - /* hex dump output buffer for debug */ unsigned long flags; struct list_head *lptr; + char obuf_s[3*32]; - if ((at76_debug & DBG_BSS_TABLE) || (force_output)) { - spin_lock_irqsave(&dev->bss_list_spinlock, flags); - - dbg_uc("%s BSS table (curr=%p, new=%p):", dev->netdev->name, - dev->curr_bss, dev->new_bss); + spin_lock_irqsave(&dev->bss_list_spinlock, flags); - list_for_each(lptr, &dev->bss_list) { - ptr = list_entry(lptr, struct bss_info, list); - dbg_uc("0x%p: bssid %s channel %d ssid %s (%s)" - " capa x%04x rates %s rssi %d link %d noise %d", - ptr, mac2str(ptr->bssid), - ptr->channel, - ptr->ssid, - hex2str(dev->obuf, ptr->ssid, - min((sizeof(dev->obuf) - 1) / 2, - (size_t) ptr->ssid_len), '\0'), - ptr->capa, - hex2str(dev->obuf_s, ptr->rates, - min(sizeof(dev->obuf_s) / 3, - (size_t) ptr->rates_len), ' '), - ptr->rssi, ptr->link_qual, ptr->noise_level); - } + dbg_uc("%s BSS table (curr=%p, new=%p):", dev->netdev->name, + dev->curr_bss, dev->new_bss); - spin_unlock_irqrestore(&dev->bss_list_spinlock, flags); + list_for_each(lptr, &dev->bss_list) { + ptr = list_entry(lptr, struct bss_info, list); + dbg_uc("0x%p: bssid %s channel %d ssid %s (%s)" + " capa x%04x rates %s rssi %d link %d noise %d", + ptr, mac2str(ptr->bssid), + ptr->channel, + ptr->ssid, + hex2str(dev->obuf, ptr->ssid, + min((sizeof(dev->obuf) - 1) / 2, + (size_t) ptr->ssid_len), '\0'), + ptr->capa, + hex2str(obuf_s, ptr->rates, + min(sizeof(obuf_s) / 3, + (size_t) ptr->rates_len), ' '), + ptr->rssi, ptr->link_qual, ptr->noise_level); } + + spin_unlock_irqrestore(&dev->bss_list_spinlock, flags); } /** @@ -605,7 +605,6 @@ struct at76c503 { unsigned int device_unplugged:1; unsigned int netdev_registered:1; char obuf[2 * 256 + 1]; /* global debug output buffer to reduce stack usage */ - char obuf_s[3 * 32]; /* small global debug output buffer to reduce stack usage */ struct set_mib_buffer mib_buf; /* global buffer for set_mib calls */ /* new whiz-bang feature flags */ |