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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents d6067f0e 97dc94f1

MAINTAINERS

+0 −10
Original line number Diff line number Diff line
@@ -5629,16 +5629,6 @@ F: Documentation/networking/mac80211-injection.txt 
F:	include/net/mac80211.h

F:	net/mac80211/



MAC80211 PID RATE CONTROL

M:	Stefano Brivio <stefano.brivio@polimi.it>

M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	net/mac80211/rc80211_pid*



MACVLAN DRIVER

M:	Patrick McHardy <kaber@trash.net>

L:	netdev@vger.kernel.org

drivers/net/wireless/at76c50x-usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1955,8 +1955,9 @@ static void at76_dwork_hw_scan(struct work_struct *work) 


static int at76_hw_scan(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif,

			struct cfg80211_scan_request *req)

			struct ieee80211_scan_request *hw_req)

{

	struct cfg80211_scan_request *req = &hw_req->req;

	struct at76_priv *priv = hw->priv;

	struct at76_req_scan scan;

	u8 *ssid = NULL;

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -3137,10 +3137,11 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 


static int ath10k_hw_scan(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif,

			  struct cfg80211_scan_request *req)

			  struct ieee80211_scan_request *hw_req)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct cfg80211_scan_request *req = &hw_req->req;

	struct wmi_start_scan_arg arg;

	int ret = 0;

	int i;

drivers/net/wireless/ath/ath9k/main.c

+2 −1
Original line number Diff line number Diff line
@@ -2409,8 +2409,9 @@ void ath_offchannel_timer(unsigned long data) 
}



static int ath9k_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			 struct cfg80211_scan_request *req)

			 struct ieee80211_scan_request *hw_req)

{

	struct cfg80211_scan_request *req = &hw_req->req;

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	int ret = 0;

drivers/net/wireless/cw1200/scan.c

+2 −1
Original line number Diff line number Diff line
@@ -53,9 +53,10 @@ static int cw1200_scan_start(struct cw1200_common *priv, struct wsm_scan *scan) 


int cw1200_hw_scan(struct ieee80211_hw *hw,

		   struct ieee80211_vif *vif,

		   struct cfg80211_scan_request *req)

		   struct ieee80211_scan_request *hw_req)

{

	struct cw1200_common *priv = hw->priv;

	struct cfg80211_scan_request *req = &hw_req->req;

	struct wsm_template_frame frame = {

		.frame_type = WSM_FRAME_TYPE_PROBE_REQUEST,

	};