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

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

Merge branch 'master' into for-davem 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c
parents cade4555 80652480

Documentation/DocBook/80211.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe

!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session

!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe

!Finclude/net/mac80211.h rate_control_changed

!Finclude/net/mac80211.h ieee80211_rate_control_changed

!Finclude/net/mac80211.h ieee80211_tx_rate_control

!Finclude/net/mac80211.h rate_control_send_low

      </chapter>

Documentation/networking/mac80211-auth-assoc-deauth.txt

+3 −7
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ BA session stop & deauth/disassoc frames 
end note

end



mac80211->driver: config(channel, non-HT)

mac80211->driver: config(channel, channel type)

mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)

mac80211->driver: sta_state(AP, exists)
@@ -51,7 +51,7 @@ note over mac80211,driver: cleanup like for authenticate 
end



alt not previously authenticated (FT)

mac80211->driver: config(channel, non-HT)

mac80211->driver: config(channel, channel type)

mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)

mac80211->driver: sta_state(AP, exists)

mac80211->driver: sta_state(AP, authenticated)
@@ -67,10 +67,6 @@ end 


mac80211->driver: set up QoS parameters



alt is HT channel

mac80211->driver: config(channel, HT params)

end



mac80211->driver: bss_info_changed(QoS, HT, associated with AID)

mac80211->userspace: associated
@@ -95,5 +91,5 @@ mac80211->driver: sta_state(AP,exists) 
mac80211->driver: sta_state(AP,not-exists)

mac80211->driver: turn off powersave

mac80211->driver: bss_info_changed(clear BSSID, not associated, no QoS, ...)

mac80211->driver: config(non-HT channel type)

mac80211->driver: config(channel type to non-HT)

mac80211->userspace: disconnected

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1522,8 +1522,8 @@ M: Gustavo Padovan <gustavo@padovan.org> 
M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

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

S:	Maintained

F:	drivers/bluetooth/
@@ -1533,8 +1533,8 @@ M: Gustavo Padovan <gustavo@padovan.org> 
M:	Johan Hedberg <johan.hedberg@gmail.com>

L:	linux-bluetooth@vger.kernel.org

W:	http://www.bluez.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

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

S:	Maintained

F:	net/bluetooth/

F:	include/net/bluetooth/

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config BCMA_HOST_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on BCMA && MIPS

	depends on BCMA && MIPS && BCMA_HOST_PCI

	help

	  PCI core hostmode operation (external PCI bus).

drivers/bcma/driver_pci_host.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include "bcma_private.h"

#include <linux/pci.h>

#include <linux/export.h>

#include <linux/bcma/bcma.h>

#include <asm/paccess.h>