Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits) [NetLabel]: correct usage of RCU locking [TCP]: fix D-SACK cwnd handling [NET] napi: use non-interruptible sleep in napi_disable [SCTP] net/sctp/auth.c: make 3 functions static [TCP]: Add missing I/O AT code to ipv6 side. [SCTP]: #if 0 sctp_update_copy_cksum() [INET]: Unexport icmpmsg_statistics [NET]: Unexport sock_enable_timestamp(). [TCP]: Make tcp_match_skb_to_sack() static. [IRDA]: Make ircomm_tty static. [NET] fs/proc/proc_net.c: make a struct static [NET] dev_change_name: ignore changes to same name [NET]: Document some simple rules for actions [NET_CLS_ACT]: Use skb_act_clone [NET_CLS_ACT]: Introduce skb_act_clone [TCP]: Fix scatterlist handling in MD5 signature support. [IPSEC]: Fix scatterlist handling in skb_icv_walk(). [IPSEC]: Add missing sg_init_table() calls to ESP. [CRYPTO]: Initialize TCRYPT on-stack scatterlist objects correctly. [CRYPTO]: HMAC needs some more scatterlist fixups. ...
No related branches found
No related tags found
Showing
- Documentation/networking/ip-sysctl.txt 3 additions, 3 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/networking/tc-actions-env-rules.txt 29 additions, 0 deletionsDocumentation/networking/tc-actions-env-rules.txt
- MAINTAINERS 5 additions, 3 deletionsMAINTAINERS
- crypto/hmac.c 6 additions, 4 deletionscrypto/hmac.c
- crypto/tcrypt.c 13 additions, 11 deletionscrypto/tcrypt.c
- fs/proc/proc_net.c 1 addition, 1 deletionfs/proc/proc_net.c
- include/linux/dccp.h 6 additions, 6 deletionsinclude/linux/dccp.h
- include/linux/netdevice.h 1 addition, 1 deletioninclude/linux/netdevice.h
- include/net/inet_hashtables.h 0 additions, 6 deletionsinclude/net/inet_hashtables.h
- include/net/inet_sock.h 7 additions, 0 deletionsinclude/net/inet_sock.h
- include/net/irda/ircomm_tty.h 0 additions, 1 deletioninclude/net/irda/ircomm_tty.h
- include/net/sch_generic.h 15 additions, 0 deletionsinclude/net/sch_generic.h
- include/net/sctp/auth.h 0 additions, 1 deletioninclude/net/sctp/auth.h
- include/net/sctp/sctp.h 0 additions, 1 deletioninclude/net/sctp/sctp.h
- net/core/dev.c 3 additions, 0 deletionsnet/core/dev.c
- net/core/skbuff.c 0 additions, 7 deletionsnet/core/skbuff.c
- net/core/sock.c 0 additions, 1 deletionnet/core/sock.c
- net/dccp/ccids/ccid2.c 0 additions, 4 deletionsnet/dccp/ccids/ccid2.c
- net/dccp/ccids/ccid3.c 7 additions, 8 deletionsnet/dccp/ccids/ccid3.c
- net/dccp/input.c 39 additions, 9 deletionsnet/dccp/input.c
Loading
Please register or sign in to comment