aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ps3_gelic_wireless.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ps3_gelic_wireless.c')
-rw-r--r--drivers/net/ps3_gelic_wireless.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index a834b52a6a2c..c1eaeb614150 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -763,7 +763,6 @@ static void scan_list_dump(struct gelic_wl_info *wl)
763{ 763{
764 struct gelic_wl_scan_info *scan_info; 764 struct gelic_wl_scan_info *scan_info;
765 int i; 765 int i;
766 DECLARE_MAC_BUF(mac);
767 766
768 i = 0; 767 i = 0;
769 list_for_each_entry(scan_info, &wl->network_list, list) { 768 list_for_each_entry(scan_info, &wl->network_list, list) {
@@ -775,8 +774,7 @@ static void scan_list_dump(struct gelic_wl_info *wl)
775 scan_info->rate_len, scan_info->rate_ext_len, 774 scan_info->rate_len, scan_info->rate_ext_len,
776 scan_info->essid_len); 775 scan_info->essid_len);
777 /* -- */ 776 /* -- */
778 pr_debug("bssid=%s\n", 777 pr_debug("bssid=%pM\n", &scan_info->hwinfo->bssid[2]);
779 print_mac(mac, &scan_info->hwinfo->bssid[2]));
780 pr_debug("essid=%s\n", scan_info->hwinfo->essid); 778 pr_debug("essid=%s\n", scan_info->hwinfo->essid);
781 } 779 }
782} 780}
@@ -1632,7 +1630,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
1632 unsigned long this_time = jiffies; 1630 unsigned long this_time = jiffies;
1633 unsigned int data_len, i, found, r; 1631 unsigned int data_len, i, found, r;
1634 void *buf; 1632 void *buf;
1635 DECLARE_MAC_BUF(mac);
1636 1633
1637 pr_debug("%s:start\n", __func__); 1634 pr_debug("%s:start\n", __func__);
1638 mutex_lock(&wl->scan_lock); 1635 mutex_lock(&wl->scan_lock);
@@ -1684,9 +1681,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
1684 scan_info_size < data_len; 1681 scan_info_size < data_len;
1685 i++, scan_info_size += be16_to_cpu(scan_info->size), 1682 i++, scan_info_size += be16_to_cpu(scan_info->size),
1686 scan_info = (void *)scan_info + be16_to_cpu(scan_info->size)) { 1683 scan_info = (void *)scan_info + be16_to_cpu(scan_info->size)) {
1687 pr_debug("%s:size=%d bssid=%s scan_info=%p\n", __func__, 1684 pr_debug("%s:size=%d bssid=%pM scan_info=%p\n", __func__,
1688 be16_to_cpu(scan_info->size), 1685 be16_to_cpu(scan_info->size),
1689 print_mac(mac, &scan_info->bssid[2]), scan_info); 1686 &scan_info->bssid[2], scan_info);
1690 1687
1691 /* 1688 /*
1692 * The wireless firmware may return invalid channel 0 and/or 1689 * The wireless firmware may return invalid channel 0 and/or
@@ -1787,7 +1784,6 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
1787 struct gelic_wl_scan_info *best_bss; 1784 struct gelic_wl_scan_info *best_bss;
1788 int weight, best_weight; 1785 int weight, best_weight;
1789 u16 security; 1786 u16 security;
1790 DECLARE_MAC_BUF(mac);
1791 1787
1792 pr_debug("%s: <-\n", __func__); 1788 pr_debug("%s: <-\n", __func__);
1793 1789
@@ -1857,8 +1853,8 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
1857#ifdef DEBUG 1853#ifdef DEBUG
1858 pr_debug("%s: -> bss=%p\n", __func__, best_bss); 1854 pr_debug("%s: -> bss=%p\n", __func__, best_bss);
1859 if (best_bss) { 1855 if (best_bss) {
1860 pr_debug("%s:addr=%s\n", __func__, 1856 pr_debug("%s:addr=%pM\n", __func__,
1861 print_mac(mac, &best_bss->hwinfo->bssid[2])); 1857 &best_bss->hwinfo->bssid[2]);
1862 } 1858 }
1863#endif 1859#endif
1864 return best_bss; 1860 return best_bss;