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: [TG3]: Add missing unlock in tg3_open() error path. [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture. [IRDA]: Lockdep fix. [BLUETOOTH]: Fix unaligned access in hci_send_to_sock. [XFRM]: nlmsg length not computed correctly in the presence of subpolicies [XFRM]: Sub-policies broke policy events [IGMP]: Fix IGMPV3_EXP() normalization bit shift value. [Bluetooth] Ignore L2CAP config requests on disconnect [Bluetooth] Always include MTU in L2CAP config responses [Bluetooth] Check if RFCOMM session is still attached to the TTY [Bluetooth] Handling pending connect attempts after inquiry [Bluetooth] Attach low-level connections to the Bluetooth bus [IPV6] IP6TUNNEL: Add missing nf_reset() on input path. [IPV6] IP6TUNNEL: Delete all tunnel device when unloading module. [IPV6] ROUTE: Do not enable router reachability probing in router mode. [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests. [IPV6] ROUTE: Try to use router which is not known unreachable.
Showing
- drivers/net/tg3.c 3 additions, 1 deletiondrivers/net/tg3.c
- include/linux/igmp.h 1 addition, 1 deletioninclude/linux/igmp.h
- net/bluetooth/hci_event.c 19 additions, 0 deletionsnet/bluetooth/hci_event.c
- net/bluetooth/hci_sock.c 7 additions, 4 deletionsnet/bluetooth/hci_sock.c
- net/bluetooth/hci_sysfs.c 3 additions, 1 deletionnet/bluetooth/hci_sysfs.c
- net/bluetooth/l2cap.c 7 additions, 4 deletionsnet/bluetooth/l2cap.c
- net/bluetooth/rfcomm/tty.c 1 addition, 1 deletionnet/bluetooth/rfcomm/tty.c
- net/dccp/ipv6.c 1 addition, 1 deletionnet/dccp/ipv6.c
- net/ipv6/ip6_tunnel.c 18 additions, 1 deletionnet/ipv6/ip6_tunnel.c
- net/ipv6/route.c 8 additions, 7 deletionsnet/ipv6/route.c
- net/ipv6/udp.c 3 additions, 4 deletionsnet/ipv6/udp.c
- net/irda/irlmp.c 2 additions, 1 deletionnet/irda/irlmp.c
- net/xfrm/xfrm_user.c 12 additions, 1 deletionnet/xfrm/xfrm_user.c
Loading
Please register or sign in to comment