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

Commit 6e55eed8 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

parents 44621b82 15be8e89

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/bcma/driver_gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
#endif

	switch (cc->core->bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM5357:

	case BCMA_CHIP_ID_BCM53572:

		chip->ngpio	= 32;

		break;

	default:

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/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ enum ath_op_flags { 
	ATH_OP_PRIM_STA_VIF,

	ATH_OP_HW_RESET,

	ATH_OP_SCANNING,

	ATH_OP_MULTI_CHANNEL,

};



enum ath_bus_type {

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;