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

Commit f3e979a5 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents cd80e107 a9865538

drivers/net/wireless/ath/ath6kl/wmi.c

+3 −4
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len, 
		   dlen, freq, vif->probe_req_report);



	if (vif->probe_req_report || vif->nw_type == AP_NETWORK)

		cfg80211_rx_mgmt(&vif->wdev, freq, 0,

				 ev->data, dlen, GFP_ATOMIC);

		cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0,

				 GFP_ATOMIC);



	return 0;

}
@@ -608,8 +608,7 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len, 
		return -EINVAL;

	}

	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);

	cfg80211_rx_mgmt(&vif->wdev, freq, 0,

			 ev->data, dlen, GFP_ATOMIC);

	cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0, GFP_ATOMIC);



	return 0;

}

drivers/net/wireless/ath/wil6210/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
		}

	} else {

		cfg80211_rx_mgmt(wil->wdev, freq, signal,

				 (void *)rx_mgmt_frame, d_len, GFP_KERNEL);

				 (void *)rx_mgmt_frame, d_len, 0, GFP_KERNEL);

	}

}

drivers/net/wireless/brcm80211/brcmfmac/p2p.c

+2 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp, 
					      IEEE80211_BAND_5GHZ);



	wdev = &ifp->vif->wdev;

	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len,

	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0,

			 GFP_ATOMIC);



	kfree(mgmt_frame);
@@ -1895,7 +1895,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp, 
					      IEEE80211_BAND_2GHZ :

					      IEEE80211_BAND_5GHZ);



	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len,

	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0,

			 GFP_ATOMIC);



	brcmf_dbg(INFO, "mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n",

drivers/net/wireless/mac80211_hwsim.c

+3 −1
Original line number Diff line number Diff line
@@ -2528,8 +2528,10 @@ static int __init init_mac80211_hwsim(void) 
	}



	hwsim_mon = alloc_netdev(0, "hwsim%d", hwsim_mon_setup);

	if (hwsim_mon == NULL)

	if (hwsim_mon == NULL) {

		err = -ENOMEM;

		goto failed;

	}



	rtnl_lock();

drivers/net/wireless/mwifiex/util.c

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, 
	rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);



	cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq,

			 CAL_RSSI(rx_pd->snr, rx_pd->nf),

			 skb->data, pkt_len, GFP_ATOMIC);

			 CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len,

			 0, GFP_ATOMIC);



	return 0;

}