Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d23208 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

net: mac80211: Convert printk(KERN_DEBUG to pr_debug 



Standardize the debugging to be able to use dynamic_debug.

Coalesce formats, align arguments.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6efb71b0

net/mac80211/agg-rx.c

+9 −11
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, 
	RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG

	       "Rx BA session stop requested for %pM tid %u %s reason: %d\n",

	pr_debug("Rx BA session stop requested for %pM tid %u %s reason: %d\n",

		 sta->sta.addr, tid,

		 initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",

		 (int)reason);
@@ -84,8 +83,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, 


	if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP,

			     &sta->sta, tid, NULL, 0))

		printk(KERN_DEBUG "HW problem - can not stop rx "

				"aggregation for tid %d\n", tid);

		pr_debug("HW problem - can not stop rx aggregation for tid %d\n",

			 tid);



	/* check if this is a self generated aggregation halt */

	if (initiator == WLAN_BACK_RECIPIENT && tx)
@@ -156,7 +155,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data) 
	}



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);

	pr_debug("rx session timer expired on tid %d\n", (u16)*ptid);

#endif

	set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);

	ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
@@ -245,8 +244,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, 


	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Suspend in progress. "

		       "Denying ADDBA request\n");

		pr_debug("Suspend in progress - Denying ADDBA request\n");

#endif

		goto end_no_lock;

	}
@@ -320,7 +318,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, 
	ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,

			       &sta->sta, tid, &start_seq_num, 0);

#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Rx A-MPDU request on tid %d result %d\n", tid, ret);

	pr_debug("Rx A-MPDU request on tid %d result %d\n", tid, ret);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	if (ret) {

net/mac80211/agg-tx.c

+30 −38
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 
	spin_unlock_bh(&sta->lock);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n",

	pr_debug("Tx BA session stop requested for %pM tid %u\n",

		 sta->sta.addr, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */
@@ -254,15 +254,14 @@ static void sta_addba_resp_timer_expired(unsigned long data) 
	    test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {

		rcu_read_unlock();

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "timer expired on tid %d but we are not "

				"(or no longer) expecting addBA response there\n",

		pr_debug("timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",

			 tid);

#endif

		return;

	}



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "addBA response timer expired on tid %d\n", tid);

	pr_debug("addBA response timer expired on tid %d\n", tid);

#endif



	ieee80211_stop_tx_ba_session(&sta->sta, tid);
@@ -373,8 +372,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
			       &sta->sta, tid, &start_seq_num, 0);

	if (ret) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA request denied - HW unavailable for"

					" tid %d\n", tid);

		pr_debug("BA request denied - HW unavailable for tid %d\n",

			 tid);

#endif

		spin_lock_bh(&sta->lock);

		ieee80211_agg_splice_packets(sdata, tid_tx, tid);
@@ -389,7 +388,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
	/* activate the timer for the recipient's addBA response */

	mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);

#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "activated addBA response timer on tid %d\n", tid);

	pr_debug("activated addBA response timer on tid %d\n", tid);

#endif



	spin_lock_bh(&sta->lock);
@@ -438,7 +437,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data) 
	rcu_read_unlock();



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "tx session timer expired on tid %d\n", (u16)*ptid);

	pr_debug("tx session timer expired on tid %d\n", (u16)*ptid);

#endif



	ieee80211_stop_tx_ba_session(&sta->sta, *ptid);
@@ -464,7 +463,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
		return -EINVAL;



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Open BA session requested for %pM tid %u\n",

	pr_debug("Open BA session requested for %pM tid %u\n",

		 pubsta->addr, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */
@@ -477,8 +476,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 


	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA sessions blocked. "

		       "Denying BA session request\n");

		pr_debug("BA sessions blocked - Denying BA session request\n");

#endif

		return -EINVAL;

	}
@@ -498,8 +496,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&

	    !sta->sta.ht_cap.ht_supported) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA request denied - IBSS STA %pM"

		       "does not advertise HT support\n", pubsta->addr);

		pr_debug("BA request denied - IBSS STA %pM does not advertise HT support\n",

			 pubsta->addr);

#endif /* CONFIG_MAC80211_HT_DEBUG */

		return -EINVAL;

	}
@@ -521,9 +519,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	    time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +

			HT_AGG_RETRIES_PERIOD)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA request denied - "

		       "waiting a grace period after %d failed requests "

		       "on tid %u\n",

		pr_debug("BA request denied - waiting a grace period after %d failed requests on tid %u\n",

			 sta->ampdu_mlme.addba_req_num[tid], tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */

		ret = -EBUSY;
@@ -534,8 +530,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	/* check if the TID is not in aggregation flow already */

	if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA request denied - session is not "

				 "idle on tid %u\n", tid);

		pr_debug("BA request denied - session is not idle on tid %u\n",

			 tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */

		ret = -EAGAIN;

		goto err_unlock_sta;
@@ -592,7 +588,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local, 
	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid);

	pr_debug("Aggregation is on for tid %d\n", tid);

#endif



	drv_ampdu_action(local, sta->sdata,
@@ -628,8 +624,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 


	if (tid >= STA_TID_NUM) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n",

				tid, STA_TID_NUM);

		pr_debug("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);

#endif

		return;

	}
@@ -639,7 +634,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 
	if (!sta) {

		mutex_unlock(&local->sta_mtx);

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

		pr_debug("Could not find station: %pM\n", ra);

#endif

		return;

	}
@@ -649,7 +644,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 


	if (WARN_ON(!tid_tx)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "addBA was not requested!\n");

		pr_debug("addBA was not requested!\n");

#endif

		goto unlock;

	}
@@ -751,15 +746,13 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 


	if (tid >= STA_TID_NUM) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n",

				tid, STA_TID_NUM);

		pr_debug("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);

#endif

		return;

	}



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Stopping Tx BA session for %pM tid %d\n",

	       ra, tid);

	pr_debug("Stopping Tx BA session for %pM tid %d\n", ra, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	mutex_lock(&local->sta_mtx);
@@ -767,7 +760,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 
	sta = sta_info_get_bss(sdata, ra);

	if (!sta) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

		pr_debug("Could not find station: %pM\n", ra);

#endif

		goto unlock;

	}
@@ -778,7 +771,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 


	if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "unexpected callback to A-MPDU stop\n");

		pr_debug("unexpected callback to A-MPDU stop\n");

#endif

		goto unlock_sta;

	}
@@ -856,7 +849,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 


	if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "wrong addBA response token, tid %d\n", tid);

		pr_debug("wrong addBA response token, tid %d\n", tid);

#endif

		goto out;

	}
@@ -864,7 +857,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 
	del_timer_sync(&tid_tx->addba_resp_timer);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid);

	pr_debug("switched off addBA timer for tid %d\n", tid);

#endif



	/*
@@ -875,8 +868,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 
	if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) ||

	    test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG

		       "got addBA resp for tid %d but we already gave up\n",

		pr_debug("got addBA resp for tid %d but we already gave up\n",

			 tid);

#endif

		goto out;

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -2679,7 +2679,7 @@ static int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;



#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG

	printk(KERN_DEBUG "TDLS mgmt action %d peer %pM\n", action_code, peer);

	pr_debug("TDLS mgmt action %d peer %pM\n", action_code, peer);

#endif



	skb = dev_alloc_skb(local->hw.extra_tx_headroom +
@@ -2790,7 +2790,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;



#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG

	printk(KERN_DEBUG "TDLS oper %d peer %pM\n", oper, peer);

	pr_debug("TDLS oper %d peer %pM\n", oper, peer);

#endif



	switch (oper) {

net/mac80211/debugfs_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -685,6 +685,6 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) 


	sprintf(buf, "netdev:%s", sdata->name);

	if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))

		printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs "

		pr_err("mac80211: debugfs: failed to rename debugfs "

		       "dir to %s\n", buf);

}

net/mac80211/ibss.c

+39 −49
Original line number Diff line number Diff line
@@ -282,9 +282,8 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta, 
		return sta_info_get(sdata, addr);

	if (auth) {

#ifdef CONFIG_MAC80211_IBSS_DEBUG

		printk(KERN_DEBUG "TX Auth SA=%pM DA=%pM BSSID=%pM"

		       "(auth_transaction=1)\n", sdata->vif.addr,

		       sdata->u.ibss.bssid, addr);

		pr_debug("TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",

			 sdata->vif.addr, sdata->u.ibss.bssid, addr);

#endif

		ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,

				    addr, sdata->u.ibss.bssid, NULL, 0, 0);
@@ -356,9 +355,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, 
	if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)

		return;

#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "%s: RX Auth SA=%pM DA=%pM BSSID=%pM."

	       "(auth_transaction=%d)\n",

	       sdata->name, mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);

	pr_debug("%s: RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",

		 sdata->name, mgmt->sa, mgmt->da, mgmt->bssid,

		 auth_transaction);

#endif

	sta_info_destroy_addr(sdata, mgmt->sa);

	ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
@@ -423,10 +422,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 


				if (sta->sta.supp_rates[band] != prev_rates) {

#ifdef CONFIG_MAC80211_IBSS_DEBUG

					printk(KERN_DEBUG

						"%s: updated supp_rates set "

						"for %pM based on beacon"

						"/probe_resp (0x%x -> 0x%x)\n",

					pr_debug("%s: updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",

						 sdata->name, sta->sta.addr,

						 prev_rates,

						 sta->sta.supp_rates[band]);
@@ -546,8 +542,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
	}



#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "RX beacon SA=%pM BSSID="

	       "%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",

	pr_debug("RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",

		 mgmt->sa, mgmt->bssid,

		 (unsigned long long)rx_timestamp,

		 (unsigned long long)beacon_timestamp,
@@ -557,8 +552,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 


	if (beacon_timestamp > rx_timestamp) {

#ifdef CONFIG_MAC80211_IBSS_DEBUG

		printk(KERN_DEBUG "%s: beacon TSF higher than "

		       "local TSF - IBSS merge with BSSID %pM\n",

		pr_debug("%s: beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",

			 sdata->name, mgmt->bssid);

#endif

		ieee80211_sta_join_ibss(sdata, bss);
@@ -662,8 +656,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) 
	if (ifibss->fixed_channel)

		return;



	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "

	       "IBSS networks with same SSID (merge)\n", sdata->name);

	pr_debug("%s: No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n",

		 sdata->name);



	ieee80211_request_internal_scan(sdata,

			ifibss->ssid, ifibss->ssid_len, NULL);
@@ -691,7 +685,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) 
		bssid[0] |= 0x02;

	}



	printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",

	pr_debug("%s: Creating new IBSS network, BSSID %pM\n",

		 sdata->name, bssid);



	capability = WLAN_CAPABILITY_IBSS;
@@ -724,7 +718,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) 


	active_ibss = ieee80211_sta_active_ibss(sdata);

#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",

	pr_debug("%s: sta_find_ibss (active_ibss=%d)\n",

		 sdata->name, active_ibss);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */
@@ -750,12 +744,11 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) 


		bss = (void *)cbss->priv;

#ifdef CONFIG_MAC80211_IBSS_DEBUG

		printk(KERN_DEBUG "   sta_find_ibss: selected %pM current "

		       "%pM\n", cbss->bssid, ifibss->bssid);

		pr_debug("   sta_find_ibss: selected %pM current %pM\n",

			 cbss->bssid, ifibss->bssid);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */



		printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"

		       " based on configured SSID\n",

		pr_debug("%s: Selected IBSS BSSID %pM based on configured SSID\n",

			 sdata->name, cbss->bssid);



		ieee80211_sta_join_ibss(sdata, bss);
@@ -764,14 +757,14 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) 
	}



#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "   did not try to join ibss\n");

	pr_debug("   did not try to join ibss\n");

#endif /* CONFIG_MAC80211_IBSS_DEBUG */



	/* Selected IBSS not found in current scan results - try to scan */

	if (time_after(jiffies, ifibss->last_scan_completed +

					IEEE80211_SCAN_INTERVAL)) {

		printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "

		       "join\n", sdata->name);

		pr_debug("%s: Trigger new scan to find an IBSS to join\n",

			 sdata->name);



		ieee80211_request_internal_scan(sdata,

				ifibss->ssid, ifibss->ssid_len,
@@ -785,8 +778,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) 
				ieee80211_sta_create_ibss(sdata);

				return;

			}

			printk(KERN_DEBUG "%s: IBSS not allowed on"

			       " %d MHz\n", sdata->name,

			pr_debug("%s: IBSS not allowed on %d MHz\n",

				 sdata->name,

				 local->hw.conf.channel->center_freq);



			/* No IBSS found - decrease scan interval and continue
@@ -823,8 +816,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 
	tx_last_beacon = drv_tx_last_beacon(local);



#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM"

	       " (tx_last_beacon=%d)\n",

	pr_debug("%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",

		 sdata->name, mgmt->sa, mgmt->da,

		 mgmt->bssid, tx_last_beacon);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */
@@ -841,8 +833,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 
	if (pos[0] != WLAN_EID_SSID ||

	    pos + 2 + pos[1] > end) {

#ifdef CONFIG_MAC80211_IBSS_DEBUG

		printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "

		       "from %pM\n",

		pr_debug("%s: Invalid SSID IE in ProbeReq from %pM\n",

			 sdata->name, mgmt->sa);

#endif

		return;
@@ -862,8 +853,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 
	resp = (struct ieee80211_mgmt *) skb->data;

	memcpy(resp->da, mgmt->sa, ETH_ALEN);

#ifdef CONFIG_MAC80211_IBSS_DEBUG

	printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n",

	       sdata->name, resp->da);

	pr_debug("%s: Sending ProbeResp to %pM\n", sdata->name, resp->da);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */

	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	ieee80211_tx_skb(sdata, skb);