diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-03 03:58:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-03 03:58:01 +0200 |
| commit | da241efcd9c3da2af6ba20055c7e158ec725005c (patch) | |
| tree | f104cfbd25b2b88f4b246d2da14241a4a038cd0b /net/ipv4/Makefile | |
| parent | Merge tag 'regmap-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | VSOCK: Handle changes to the VMCI context ID. (diff) | |
| download | linux-da241efcd9c3da2af6ba20055c7e158ec725005c.tar.xz linux-da241efcd9c3da2af6ba20055c7e158ec725005c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Fix VSOCK layer handling of context ID changes, from Reilly Grant.
2) Now that we have a synchronize_net() in netdev_rx_handler_unregister(),
we can't let any call sites hold locks. Unfortunately bonding does,
so we have to drop the rwlock there a little bit earlier, fix from
Veaceslav Falico.
3) MAC address setting loop exits one iteration too early in mlx4
driver, from Yan Burman.
4) Restore ipv6 routes properly upon ifdown/ifup of loopback, from
Balakumaran Kannan.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
VSOCK: Handle changes to the VMCI context ID.
net IPv6 : Fix broken IPv6 routing table after loopback down-up
cbq: incorrect processing of high limits
net/mlx4_en: Fix setting initial MAC address
bonding: get netdev_rx_handler_unregister out of locks
Diffstat (limited to 'net/ipv4/Makefile')
0 files changed, 0 insertions, 0 deletions