linux-toradex.git/include/linux/ieee80211.h, branch v3.12.42 Linux kernel for Apalis and Colibri modules Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-08-29T18:08:24+00:00 John W. Linville linville@tuxdriver.com 2013-08-29T18:08:24+00:00 0d8165e9fca119b804de2cf35674e07c36c9704f Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-08-12T18:45:06+00:00 John W. Linville linville@tuxdriver.com 2013-08-12T18:45:06+00:00 89c2af3c14ddf8ae48637a7b454d66ac5e0ca728 Conflicts: drivers/net/ethernet/broadcom/Kconfig 
Conflicts:
	drivers/net/ethernet/broadcom/Kconfig
wireless: make TU conversion macros available 2013-08-06T09:00:59+00:00 Johannes Berg johannes.berg@intel.com 2013-07-25T19:45:17+00:00 e7f1935c11269bc53cd52425b1025657adddb839 A few places in the code (mac80211 and iwlmvm) use the same TU_TO_JIFFIES() macro and could use TU_TO_EXP_TIME() that mac80211 has. Make these available to everyone and use them. Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
A few places in the code (mac80211 and iwlmvm) use the same
TU_TO_JIFFIES() macro and could use TU_TO_EXP_TIME() that
mac80211 has. Make these available to everyone and use them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include: Convert ethernet mac address declarations to use ETH_ALEN 2013-08-02T19:33:54+00:00 Joe Perches joe@perches.com 2013-08-01T23:17:48+00:00 574e2af7c0af3273836def5e66f236521bb433c9 It's convenient to have ethernet mac addresses use ETH_ALEN to be able to grep for them a bit easier and also to ensure that the addresses are __aligned(2). Add #include <linux/if_ether.h> as necessary. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
It's convenient to have ethernet mac addresses use
ETH_ALEN to be able to grep for them a bit easier and
also to ensure that the addresses are __aligned(2).

Add #include <linux/if_ether.h> as necessary.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ieee80211: add definition for 802.11ac information elements 2013-08-01T08:49:03+00:00 Fred Zhou fred.zy@gmail.com 2013-08-01T06:16:28+00:00 9e2bc79bce58a1ce0005015c9351b3bcaaa02e5c Add element IDs for Extended BSS Load, VHT TX Power Envelope, AID, and Quiet Channel. Signed-off-by: Fred Zhou <fred.zy@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
Add element IDs for Extended BSS Load, VHT TX
Power Envelope, AID, and Quiet Channel.

Signed-off-by: Fred Zhou <fred.zy@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
ieee80211: add definition for interworking support 2013-08-01T08:49:03+00:00 Avinash Patil patila@marvell.com 2013-07-27T00:02:29+00:00 dcb7a6ce0a08012a17cca34711a02017abed554b IEEE802.11u interworking support is advertised via extended capabilities IE bit 31. This is 7th bit of 4th byte of extended capabilities. Signed-off-by: Avinash Patil <patila@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
IEEE802.11u interworking support is advertised via extended
capabilities IE bit 31. This is 7th bit of 4th byte of extended
capabilities.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
mac80211: set mesh formation field properly 2013-06-03T15:03:18+00:00 Jacob Minshall jacob@cozybit.com 2013-05-29T21:32:36+00:00 e05ecccdf752122a439b03c3190458d2c8f0bac6 Cap max peerings at 63 in accordance with IEEE-2012 8.4.2.100.7. Triggers a beacon regeneration every time the number of peerings changes. Previously this would only happen if the "accepting peerings" bit changed. Signed-off-by: Jacob Minshall <jacob@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
Cap max peerings at 63 in accordance with IEEE-2012 8.4.2.100.7.
Triggers a beacon regeneration every time the number of peerings changes.
Previously this would only happen if the "accepting peerings" bit changed.

Signed-off-by: Jacob Minshall <jacob@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
wireless: move crypto constants to ieee80211.h 2013-05-16T20:39:41+00:00 Johannes Berg johannes.berg@intel.com 2013-05-08T11:09:08+00:00 4325f6caad98c075b39f0eaaac6693a0dd43f646 mac80211 and the Intel drivers all define crypto constants, move them to ieee80211.h instead. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
mac80211 and the Intel drivers all define crypto
constants, move them to ieee80211.h instead.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
mac80211: parse VHT channel switch IEs 2013-04-16T13:29:45+00:00 Johannes Berg johannes.berg@intel.com 2013-03-26T13:54:16+00:00 b2e506bfc4d752b68a0ccaae1e977898263eba4c VHT introduces multiple IEs that need to be parsed for a wide bandwidth channel switch. Two are (currently) needed in mac80211: * wide bandwidth channel switch element * channel switch wrapper element The former is contained in the latter for beacons and probe responses, but not for the spectrum management action frames so the IE parser needs a new argument to differentiate them. Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
VHT introduces multiple IEs that need to be parsed for a
wide bandwidth channel switch. Two are (currently) needed
in mac80211:
 * wide bandwidth channel switch element
 * channel switch wrapper element

The former is contained in the latter for beacons and probe
responses, but not for the spectrum management action frames
so the IE parser needs a new argument to differentiate them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
mac80211: handle extended channel switch announcement 2013-04-16T13:29:45+00:00 Johannes Berg johannes.berg@intel.com 2013-03-26T14:17:18+00:00 1b3a2e494bc793445f576c5476e9767cf7621684 Handle the (public) extended channel switch announcement action frames. Parts of the data in these frames isn't really in IEs, but put it into the elems struct anyway to simplify the handling. Signed-off-by: Johannes Berg <johannes.berg@intel.com> 
Handle the (public) extended channel switch announcement
action frames. Parts of the data in these frames isn't
really in IEs, but put it into the elems struct anyway
to simplify the handling.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>