2013-07-26 08:35:43

by Johannes Berg

[permalink] [raw]
Subject: pull-request: mac80211-next 2013-07-26

John,

This is a more traditional pull request without patches since they've
all been to the list :-) First set of updates for mac80211-next.

The biggest change here is probably the initial 5/10 MHz support for
IBSS, the remaining patches are smaller features and some cleanups.

Let me know if there's any problem.

johannes


The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:

Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)

are available in the git repository at:

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

for you to fetch changes up to c82b5a74cc739385db6e4275fe504a0e9469bf01:

mac80211: make active monitor injection work w/ HW queue (2013-07-16 09:58:19 +0300)

----------------------------------------------------------------
Amitkumar Karwar (2):
cfg80211/nl80211: rename packet pattern related structures and enums
cfg80211/nl80211: Add packet coalesce support

Chun-Yeow Yeoh (1):
mac80211: set forwarding in mesh capability info

Johannes Berg (6):
wireless: indent kernel-doc with tabs
mac80211: add per-chain signal information to radiotap
mac80211_hwsim: use ieee80211_free_txskb
mac80211_hwsim: claim uAPSD support
mac80211_hwsim: claim active monitor support
mac80211: make active monitor injection work w/ HW queue

Simon Wunderlich (14):
nl80211: enable HT overrides for ibss
mac80211: enable HT overrides for ibss
nl80211: add scan width to bss and scan request structs
mac80211/rc80211: add chandef to rate initialization
mac80211: fix timing for 5 MHz and 10 MHz channels
mac80211: add radiotap flag and handling for 5/10 MHz
mac80211: select and adjust bitrates according to channel mode
cfg80211/mac80211: get mandatory rates based on scan width
cfg80211/mac80211: use reduced txpower for 5 and 10 MHz
mac80211: allow scanning for 5/10 MHz channels in IBSS
mac80211: return if IBSS chandef can not be used
nl80211: allow 5 and 10 MHz channels for IBSS
mac80211: fix regression when initializing ibss wmm params
mac80211: fix off-by-one regression in ibss beacon generation

drivers/net/wireless/ath/ath9k/main.c | 2 +-
drivers/net/wireless/ath/ath9k/rc.c | 2 +
drivers/net/wireless/iwlegacy/3945-rs.c | 1 +
drivers/net/wireless/iwlegacy/4965-rs.c | 1 +
drivers/net/wireless/iwlwifi/dvm/rs.c | 3 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 5 +-
drivers/net/wireless/mac80211_hwsim.c | 10 +-
drivers/net/wireless/mwifiex/cfg80211.c | 3 +-
drivers/net/wireless/rtlwifi/rc.c | 1 +
drivers/net/wireless/ti/wlcore/main.c | 10 +-
include/net/cfg80211.h | 164 +++++++++++++--
include/net/ieee80211_radiotap.h | 4 +
include/net/mac80211.h | 30 +--
include/uapi/linux/nl80211.h | 153 ++++++++++++--
net/mac80211/cfg.c | 45 ++--
net/mac80211/ht.c | 53 +++--
net/mac80211/ibss.c | 154 +++++++++++---
net/mac80211/ieee80211_i.h | 49 ++++-
net/mac80211/iface.c | 2 +-
net/mac80211/main.c | 15 +-
net/mac80211/mesh.c | 7 +-
net/mac80211/mesh_plink.c | 2 +-
net/mac80211/mlme.c | 98 +++++----
net/mac80211/rate.c | 46 ++--
net/mac80211/rate.h | 22 +-
net/mac80211/rc80211_minstrel.c | 33 ++-
net/mac80211/rc80211_minstrel_ht.c | 15 +-
net/mac80211/rc80211_pid_algo.c | 1 +
net/mac80211/rx.c | 97 ++++++---
net/mac80211/scan.c | 72 ++++++-
net/mac80211/status.c | 18 +-
net/mac80211/tx.c | 29 ++-
net/mac80211/util.c | 216 +++++++++++++------
net/wireless/core.c | 9 +
net/wireless/core.h | 2 +
net/wireless/mesh.c | 5 +-
net/wireless/nl80211.c | 358 ++++++++++++++++++++++++++++++--
net/wireless/nl80211.h | 2 +
net/wireless/scan.c | 31 +--
net/wireless/trace.h | 12 +-
net/wireless/util.c | 14 +-
41 files changed, 1406 insertions(+), 390 deletions(-)


Attachments:
signature.asc (801.00 B)
This is a digitally signed message part

2013-07-26 08:36:29

by Johannes Berg

[permalink] [raw]
Subject: Re: pull-request: mac80211-next 2013-07-26


> Let me know if there's any problem.

Well here's a problem - I sent the same message twice ;-) It's a perfect
duplicate though, my mistake.

johannes


2013-08-05 10:01:14

by Simon Wunderlich

[permalink] [raw]
Subject: Re: pull-request: mac80211-next 2013-07-26

Hey John,

since you have pulled the patches from Johannes, could you please also pick up
the ath9k/ath5k patches for the 5/10 MHz feature? Johannes included the nl/mac80211
parts of the patchset only, leaving the ath5k/ath9k parts unmerged.

It has been sent to this mailing list, the coverletter mail was:

> Subject: [PATCHv6 00/18] Add support for 5 and 10 MHz channels
> Date: Mon, 8 Jul 2013 16:55:48 +0200
> Message-Id: <[email protected]>

It includes 5 ath9k and 3 ath5k patches.

If there are any troubles, I can repost of course.

Thanks,
Simon


On Thu, Aug 01, 2013 at 03:27:24PM -0400, John W. Linville wrote:
> On Fri, Jul 26, 2013 at 10:35:40AM +0200, Johannes Berg wrote:
> > John,
> >
> > This is a more traditional pull request without patches since they've
> > all been to the list :-) First set of updates for mac80211-next.
> >
> > The biggest change here is probably the initial 5/10 MHz support for
> > IBSS, the remaining patches are smaller features and some cleanups.
> >
> > Let me know if there's any problem.
> >
> > johannes
> >
> >
> > The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
> >
> > Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git for-john
> >
> > for you to fetch changes up to c82b5a74cc739385db6e4275fe504a0e9469bf01:
> >
> > mac80211: make active monitor injection work w/ HW queue (2013-07-16 09:58:19 +0300)
>
> Pulling now...
>
> --
> John W. Linville Someday the world will need a hero, and you
> [email protected] might be all we have. Be ready.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


Attachments:
(No filename) (1.88 kB)
signature.asc (198.00 B)
Digital signature
Download all attachments

2013-08-01 19:30:12

by John W. Linville

[permalink] [raw]
Subject: Re: pull-request: mac80211-next 2013-07-26

On Fri, Jul 26, 2013 at 10:35:40AM +0200, Johannes Berg wrote:
> John,
>
> This is a more traditional pull request without patches since they've
> all been to the list :-) First set of updates for mac80211-next.
>
> The biggest change here is probably the initial 5/10 MHz support for
> IBSS, the remaining patches are smaller features and some cleanups.
>
> Let me know if there's any problem.
>
> johannes
>
>
> The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
>
> Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git for-john
>
> for you to fetch changes up to c82b5a74cc739385db6e4275fe504a0e9469bf01:
>
> mac80211: make active monitor injection work w/ HW queue (2013-07-16 09:58:19 +0300)

Pulling now...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.