2014-06-24 14:20:15

by Johannes Berg

[permalink] [raw]
Subject: pull-request: mac80211 2014-06-24

Hi John,

Due to travel etc. I've been a little slow this cycle, but we do have a
few fixes that should go into the current rc series ...

We have a fix from Eliad for a time calculation, a fix from Max for
head/tailroom when sending authentication packets, a revert that Felix
requested since the patch in question broke regulatory and a fix from
myself for an issue with a new command that we advertised in the wrong
place.

Let me know if there are any issues.

johannes


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

2014-06-25 18:30:11

by John W. Linville

[permalink] [raw]
Subject: Re: pull-request: mac80211 2014-06-24

On Tue, Jun 24, 2014 at 06:23:27PM +0200, Johannes Berg wrote:
> On Tue, 2014-06-24 at 16:19 +0200, Johannes Berg wrote:
> > Hi John,
> >
> > Due to travel etc. I've been a little slow this cycle, but we do have a
> > few fixes that should go into the current rc series ...
> >
> > We have a fix from Eliad for a time calculation, a fix from Max for
> > head/tailroom when sending authentication packets, a revert that Felix
> > requested since the patch in question broke regulatory and a fix from
> > myself for an issue with a new command that we advertised in the wrong
> > place.
> >
> > Let me know if there are any issues.
>
> Well this was pretty stupid ... here's the actual pull request.
>
> johannes
>
>
> The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
>
> Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git HEAD
>
> for you to fetch changes up to 02df00eb0019e7d15a1fcddebe4d020226c1ccda:
>
> nl80211: move set_qos_map command into split state (2014-06-24 16:13:10 +0200)
>
> ----------------------------------------------------------------
> Eliad Peller (1):
> cfg80211: fix elapsed_jiffies calculation
>
> Johannes Berg (2):
> Revert "cfg80211: Use 5MHz bandwidth by default when checking usable channels"
> nl80211: move set_qos_map command into split state
>
> Max Stepanov (1):
> mac80211: WEP extra head/tail room in ieee80211_send_auth

Pulling now...

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

2014-06-24 16:23:41

by Johannes Berg

[permalink] [raw]
Subject: Re: pull-request: mac80211 2014-06-24

On Tue, 2014-06-24 at 16:19 +0200, Johannes Berg wrote:
> Hi John,
>
> Due to travel etc. I've been a little slow this cycle, but we do have a
> few fixes that should go into the current rc series ...
>
> We have a fix from Eliad for a time calculation, a fix from Max for
> head/tailroom when sending authentication packets, a revert that Felix
> requested since the patch in question broke regulatory and a fix from
> myself for an issue with a new command that we advertised in the wrong
> place.
>
> Let me know if there are any issues.

Well this was pretty stupid ... here's the actual pull request.

johannes


The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:

Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git HEAD

for you to fetch changes up to 02df00eb0019e7d15a1fcddebe4d020226c1ccda:

nl80211: move set_qos_map command into split state (2014-06-24 16:13:10 +0200)

----------------------------------------------------------------
Eliad Peller (1):
cfg80211: fix elapsed_jiffies calculation

Johannes Berg (2):
Revert "cfg80211: Use 5MHz bandwidth by default when checking usable channels"
nl80211: move set_qos_map command into split state

Max Stepanov (1):
mac80211: WEP extra head/tail room in ieee80211_send_auth

net/mac80211/util.c | 5 +++--
net/wireless/core.h | 2 +-
net/wireless/nl80211.c | 11 +++++------
net/wireless/reg.c | 22 +++++++---------------
4 files changed, 16 insertions(+), 24 deletions(-)


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