diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-10 14:10:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-10 14:10:13 -0400 |
| commit | 92f092d16c5ff6e71d8e7761e4c9193375d3c994 (patch) | |
| tree | 6bcee411cfde4897c004aa7600140f49d8253909 /net/sched/sch_api.c | |
| parent | a8d9bc2e9f5d1c5a25e33cec096d2a1652d3fd52 (diff) | |
| parent | 97bd5f0054ee879d778f4c7501ee2f88a9981ce2 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Please pull this batch of fixes intende for the 3.14 stream...
For the mac80211 bits, Johannes says:
"Here I have a fix from Eliad for the minimal channel width calculation
in the mac80211 code which lead to monitor mode not working at all for
drivers using that. One of my fixes is for an issue noticed by Michal,
we clear an already cleared value but do it without locking, so just
remove that. The other is for a data leak - we leak two bytes of kernel
memory out over the air in QoS NULL frames because those don't get a
sequence number assigned in the TX path."
For the iwlwifi bits, Emmanuel says:
"One more fix and an update for device IDs.
There is a bugzilla reported for the fix which is mentioned in the commit message."
Along with those...
Amitkumar Karwar provides two mwifiex fixes, both correcting some
data transcription problems.
Ivaylo Dimitrov uses skb_trim in the wl1251 driver to avoid
HAVE_EFFICIENT_UNALIGNED_ACCESS problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_api.c')
0 files changed, 0 insertions, 0 deletions