Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [VLAN]: Fix net_device leak. [PPP] generic: Fix receive path data clobbering & non-linear handling [PPP] generic: Call skb_cow_head before scribbling over skb [NET] skbuff: Add skb_cow_head [BRIDGE]: Kill clone argument to br_flood_* [PPP] pppoe: Fill in header directly in __pppoe_xmit [PPP] pppoe: Fix data clobbering in __pppoe_xmit and return value [PPP] pppoe: Fix skb_unshare_check call position [SCTP]: Convert bind_addr_list locking to RCU [SCTP]: Add RCU synchronization around sctp_localaddr_list [PKT_SCHED]: sch_cbq.c: Shut up uninitialized variable warning [PKTGEN]: srcmac fix [IPV6]: Fix source address selection. [IPV4]: Just increment OutDatagrams once per a datagram. [IPV6]: Just increment OutDatagrams once per a datagram. [IPV6]: Fix unbalanced socket reference with MSG_CONFIRM. [NET_SCHED] protect action config/dump from irqs [NET]: Fix two issues wrt. SO_BINDTODEVICE.
Showing
- drivers/net/ppp_generic.c 28 additions, 30 deletionsdrivers/net/ppp_generic.c
- drivers/net/pppoe.c 22 additions, 48 deletionsdrivers/net/pppoe.c
- include/linux/skbuff.h 31 additions, 9 deletionsinclude/linux/skbuff.h
- include/net/sctp/sctp.h 1 addition, 0 deletionsinclude/net/sctp/sctp.h
- include/net/sctp/structs.h 9 additions, 4 deletionsinclude/net/sctp/structs.h
- net/8021q/vlan.c 0 additions, 2 deletionsnet/8021q/vlan.c
- net/bridge/br_device.c 2 additions, 2 deletionsnet/bridge/br_device.c
- net/bridge/br_forward.c 5 additions, 16 deletionsnet/bridge/br_forward.c
- net/bridge/br_input.c 22 additions, 26 deletionsnet/bridge/br_input.c
- net/bridge/br_netfilter.c 1 addition, 1 deletionnet/bridge/br_netfilter.c
- net/bridge/br_private.h 2 additions, 6 deletionsnet/bridge/br_private.h
- net/core/pktgen.c 10 additions, 0 deletionsnet/core/pktgen.c
- net/core/sock.c 58 additions, 48 deletionsnet/core/sock.c
- net/ipv4/udp.c 3 additions, 3 deletionsnet/ipv4/udp.c
- net/ipv6/addrconf.c 1 addition, 1 deletionnet/ipv6/addrconf.c
- net/ipv6/raw.c 1 addition, 2 deletionsnet/ipv6/raw.c
- net/ipv6/udp.c 3 additions, 3 deletionsnet/ipv6/udp.c
- net/sched/act_api.c 4 additions, 4 deletionsnet/sched/act_api.c
- net/sched/act_police.c 2 additions, 2 deletionsnet/sched/act_police.c
- net/sched/sch_cbq.c 1 addition, 1 deletionnet/sched/sch_cbq.c
Loading
Please register or sign in to comment