kernel.git/net/mac80211/util.c, branch linux-3.8.y

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

2012-12-06T19:58:41Z

Conflicts: drivers/net/wireless/mwifiex/sta_ioctl.c net/mac80211/scan.c

mac80211: remove probe response temporary buffer allocation

2012-11-30T12:41:27Z

Instead of allocating a temporary buffer to build IEs build them right into the SKB. Signed-off-by: Johannes Berg

mac80211: make ieee80211_build_preq_ies safer

2012-11-30T12:41:26Z

Instead of assuming 200 bytes are always enough for all the IEs we add, give the length of the buffer to the function and warn instead of overrunning. Signed-off-by: Johannes Berg

mac80211: support P2P GO powersave configuration

2012-11-27T10:56:19Z

If the low-level driver wants to support P2P GO powersave configuration, it must set the cfg80211 flags and mac80211 will pass the parameters to it. Signed-off-by: Johannes Berg

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

2012-11-26T19:46:41Z

mac80211: support drivers reporting VHT RX

2012-11-26T11:42:59Z

Add support to mac80211 for having drivers report received VHT MCS information. Signed-off-by: Johannes Berg

mac80211: convert to channel definition struct

2012-11-26T11:42:59Z

Convert mac80211 (and where necessary, some drivers a little bit) to the new channel definition struct. This will allow extending mac80211 for VHT, which is currently restricted to channel contexts since there are no drivers using that which makes it easier. As I also don't care about VHT for drivers not using the channel context API, I won't convert the previous API to VHT support. Signed-off-by: Johannes Berg

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

2012-11-21T19:43:51Z

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-11-21T17:57:56Z

Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c drivers/net/wireless/iwlwifi/pcie/tx.c

mac80211: fix channel context suspend/reconfig handling

2012-11-20T09:33:05Z

Sujith reported warnings with suspend/resume due to channel contexts. When I looked into it, I realised that the code was completely broken as it unassigned the channel contexts when suspending, which actually means they are destroyed. Eliad Peller then pointed out that we also need to remove the channel contexts from the driver. When I looked into this, I also noticed that the code isn't handling the virtual monitor interface correctly (if it exists.) Fix this by calling just the driver methods (if they are implemented) instead of using the channel context management code. Also add reconfiguration for the virtual monitor interface. Reported-by: Sujith Manoharan Signed-off-by: Johannes Berg