Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER] x_table.c: sem2mutex [IPV4]: Aggregate route entries with different TOS values [TCP]: Mark tcp_*mem[] __read_mostly. [TCP]: Set default max buffers from memory pool size [SCTP]: Fix up sctp_rcv return value [NET]: Take RTNL when unregistering notifier [WIRELESS]: Fix config dependencies. [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms. [NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. [MODULES]: Don't allow statically declared exports [BRIDGE]: Unaligned accesses in the ethernet bridge
No related branches found
No related tags found
Showing
- drivers/net/wireless/Kconfig 1 addition, 0 deletionsdrivers/net/wireless/Kconfig
- include/linux/module.h 1 addition, 0 deletionsinclude/linux/module.h
- include/net/route.h 1 addition, 1 deletioninclude/net/route.h
- include/net/sock.h 1 addition, 1 deletioninclude/net/sock.h
- net/bridge/br_stp_bpdu.c 3 additions, 2 deletionsnet/bridge/br_stp_bpdu.c
- net/core/dev.c 6 additions, 1 deletionnet/core/dev.c
- net/core/sock.c 3 additions, 2 deletionsnet/core/sock.c
- net/ipv4/icmp.c 1 addition, 1 deletionnet/ipv4/icmp.c
- net/ipv4/route.c 18 additions, 27 deletionsnet/ipv4/route.c
- net/ipv4/tcp.c 16 additions, 10 deletionsnet/ipv4/tcp.c
- net/netfilter/x_tables.c 29 additions, 27 deletionsnet/netfilter/x_tables.c
- net/sctp/input.c 4 additions, 8 deletionsnet/sctp/input.c
Loading
Please register or sign in to comment