[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

[mirror_ubuntu-bionic-kernel.git] / net / ieee80211 / softmac / ieee80211softmac_assoc.c

diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index cc8110bdd5799359e95be983db36ba1616b6dff1..4c0feb2dacd89cd92977635af6ad9f19e2d5d20c 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -271,8 +271,9 @@ ieee80211softmac_assoc_work(struct work_struct *work)
                         */
                        dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
                        ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
-                       if (ieee80211softmac_start_scan(mac))
+                       if (ieee80211softmac_start_scan(mac)) {
                                dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
+                       }
                        goto out;
                } else {
                        mac->associnfo.associating = 0;
@@ -371,6 +372,7 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
        u16 status = le16_to_cpup(&resp->status);
        struct ieee80211softmac_network *network = NULL;
        unsigned long flags;
+       DECLARE_MAC_BUF(mac2);
 
        if (unlikely(!mac->running))
                return -ENODEV;
@@ -387,7 +389,8 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
 
        /* someone sending us things without us knowing him? Ignore. */
        if (!network) {
-               dprintk(KERN_INFO PFX "Received unrequested assocation response from " MAC_FMT "\n", MAC_ARG(resp->header.addr3));
+               dprintk(KERN_INFO PFX "Received unrequested assocation response from %s\n",
+                       print_mac(mac2, resp->header.addr3));
                spin_unlock_irqrestore(&mac->lock, flags);
                return 0;
        }