diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-02 16:39:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-02 16:39:00 -0800 |
| commit | 7e5530af11be68f3109672aed59243f82e1272f0 (patch) | |
| tree | 743e83fcc3a4ebdc3f5a3df394f6a227086cb617 /init | |
| parent | 4ccc804586c9ad1622687a24223c6ad2955759cc (diff) | |
| parent | 892a925e42adb8192a3c832ad29cbc780fc466f6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) 8139cp leaks memory in error paths, from Francois Romieu.
2) do_tcp_sendpages() cannot handle order > 0 pages, but they can
certainly arrive there now, fix from Eric Dumazet.
3) Race condition and sysfs fixes in bonding from Nikolay Aleksandrov.
4) Remain-on-Channel fix in mac80211 from Felix Liao.
5) CCK rate calculation fix in iwlwifi, from Emmanuel Grumbach.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
8139cp: fix coherent mapping leak in error path.
tcp: fix crashes in do_tcp_sendpages()
bonding: fix race condition in bonding_store_slaves_active
bonding: make arp_ip_target parameter checks consistent with sysfs
bonding: fix miimon and arp_interval delayed work race conditions
mac80211: fix remain-on-channel (non-)cancelling
iwlwifi: fix the basic CCK rates calculation
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions