Use helpers to obtain task pid in printks

[safe/jmp/linux-2.6] / drivers / net / wireless / hostap / hostap_ioctl.c

diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 730b354..d8f5efc 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -664,6 +664,7 @@ static int hostap_join_ap(struct net_device *dev)
        unsigned long flags;
        int i;
        struct hfa384x_hostscan_result *entry;
+       DECLARE_MAC_BUF(mac);
 
        iface = netdev_priv(dev);
        local = iface->local;
@@ -685,14 +686,14 @@ static int hostap_join_ap(struct net_device *dev)
 
        if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
                                 sizeof(req))) {
-               printk(KERN_DEBUG "%s: JoinRequest " MACSTR
+               printk(KERN_DEBUG "%s: JoinRequest %s"
                       " failed\n",
-                      dev->name, MAC2STR(local->preferred_ap));
+                      dev->name, print_mac(mac, local->preferred_ap));
                return -1;
        }
 
-       printk(KERN_DEBUG "%s: Trying to join BSSID " MACSTR "\n",
-              dev->name, MAC2STR(local->preferred_ap));
+       printk(KERN_DEBUG "%s: Trying to join BSSID %s\n",
+              dev->name, print_mac(mac, local->preferred_ap));
 
        return 0;
 }
@@ -896,11 +897,8 @@ static void hostap_monitor_set_type(local_info_t *local)
        if (local->monitor_type == PRISM2_MONITOR_PRISM ||
            local->monitor_type == PRISM2_MONITOR_CAPHDR) {
                dev->type = ARPHRD_IEEE80211_PRISM;
-               dev->hard_header_parse =
-                       hostap_80211_prism_header_parse;
        } else {
                dev->type = ARPHRD_IEEE80211;
-               dev->hard_header_parse = hostap_80211_header_parse;
        }
 }
 
@@ -1140,7 +1138,7 @@ static int hostap_monitor_mode_disable(local_info_t *local)
 
        printk(KERN_DEBUG "%s: Disabling monitor mode\n", dev->name);
        dev->type = ARPHRD_ETHER;
-       dev->hard_header_parse = local->saved_eth_header_parse;
+
        if (local->func->cmd(dev, HFA384X_CMDCODE_TEST |
                             (HFA384X_TEST_STOP << 8),
                             0, NULL, NULL))
@@ -2922,7 +2920,7 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
 
        printk(KERN_DEBUG "%s: process %d (%s) used deprecated iwpriv monitor "
               "- update software to use iwconfig mode monitor\n",
-              dev->name, current->pid, current->comm);
+              dev->name, task_pid_nr(current), current->comm);
 
        /* Backward compatibility code - this can be removed at some point */
 
@@ -3697,8 +3695,10 @@ static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,
                                          struct prism2_hostapd_param *param,
                                          int param_len)
 {
-       printk(KERN_DEBUG "%ssta: associated as client with AP " MACSTR "\n",
-              local->dev->name, MAC2STR(param->sta_addr));
+       DECLARE_MAC_BUF(mac);
+       printk(KERN_DEBUG "%ssta: associated as client with AP "
+              "%s\n",
+              local->dev->name, print_mac(mac, param->sta_addr));
        memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN);
        return 0;
 }