summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-08-08 14:12:10 -0700
committerDavid S. Miller <davem@davemloft.net>2013-08-08 14:12:10 -0700
commit75848d338cdecec206018e8b49fe081c624c200d (patch)
tree89d1f8610c20b32cf9ed491e7509b0ae941643f4 /net/ipv4/ip_gre.c
parent3e3be275851bc6fc90bfdcd732cd95563acd982b (diff)
parent1826ff2357d69d3a2627df51e4ba07d24087b698 (diff)
downloadop-kernel-dev-75848d338cdecec206018e8b49fe081c624c200d.zip
op-kernel-dev-75848d338cdecec206018e8b49fe081c624c200d.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== This is a batch of fixes intended for the 3.11 queue... Regarding the mac80211 (and related) bits, Johannes says: "I have a fix from Chris for an infinite loop along with fixes from myself to prevent it entering the loop to start with (continue using disabled channels, many thanks to Chris for his debug/test help) and a workaround for broken APs that advertise a bad HT primary channel in their beacons. Additionally, a fix for another attrbuf race in mac80211 and a fix to clean up properly while P2P GO interfaces go down." Along with that... Solomon Peachy corrects a range check in cw1200 that would lead to a BUG_ON when starting AP mode. Stanislaw Gruszka provides an iwl4965 patch to power-up the device earlier (avoiding microcode errors), and another iwl4965 fix that resets the firmware after turning rfkill off (resolving a bug in the Red Hat Bugzilla). Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud