Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [PKT_SCHED]: vlan tag match [NET]: Add if_addrlabel.h to sanitized headers. [NET] rtnetlink.c: remove no longer used functions [ICMP]: Restore pskb_pull calls in receive function [INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations. [NET]: Remove further references to net-modules.txt bluetooth rfcomm tty: destroy before tty_close() bluetooth: blacklist another Broadcom BCM2035 device drivers/bluetooth/btsdio.c: fix double-free drivers/bluetooth/bpa10x.c: fix memleak bluetooth: uninlining bluetooth: hidp_process_hid_control remove unnecessary parameter dealing tun: impossible to deassert IFF_ONE_QUEUE or IFF_NO_PI hamradio: fix dmascc section mismatch [SCTP]: Fix kernel panic while received AUTH chunk with BAD shared key identifier [SCTP]: Fix kernel panic while received AUTH chunk while enabled auth [IPV4]: Formatting fix for /proc/net/fib_trie. [IPV6]: Fix sysctl compilation error. [NET_SCHED]: Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest git broken build) [IPV4]: Fix compile error building without CONFIG_FS_PROC ...
No related branches found
No related tags found
Showing
- drivers/bluetooth/bpa10x.c 1 addition, 0 deletionsdrivers/bluetooth/bpa10x.c
- drivers/bluetooth/btsdio.c 1 addition, 3 deletionsdrivers/bluetooth/btsdio.c
- drivers/bluetooth/hci_usb.c 1 addition, 0 deletionsdrivers/bluetooth/hci_usb.c
- drivers/net/Kconfig 2 additions, 4 deletionsdrivers/net/Kconfig
- drivers/net/hamradio/dmascc.c 2 additions, 2 deletionsdrivers/net/hamradio/dmascc.c
- drivers/net/tun.c 4 additions, 0 deletionsdrivers/net/tun.c
- include/linux/Kbuild 1 addition, 0 deletionsinclude/linux/Kbuild
- include/linux/pkt_cls.h 2 additions, 1 deletioninclude/linux/pkt_cls.h
- include/linux/rtnetlink.h 0 additions, 12 deletionsinclude/linux/rtnetlink.h
- include/linux/tc_ematch/tc_em_meta.h 1 addition, 0 deletionsinclude/linux/tc_ematch/tc_em_meta.h
- include/net/inet_hashtables.h 1 addition, 1 deletioninclude/net/inet_hashtables.h
- include/net/ip_fib.h 8 additions, 0 deletionsinclude/net/ip_fib.h
- include/net/ipv6.h 2 additions, 4 deletionsinclude/net/ipv6.h
- net/bluetooth/hidp/core.c 20 additions, 29 deletionsnet/bluetooth/hidp/core.c
- net/bluetooth/rfcomm/tty.c 2 additions, 1 deletionnet/bluetooth/rfcomm/tty.c
- net/core/rtnetlink.c 0 additions, 44 deletionsnet/core/rtnetlink.c
- net/ipv4/fib_trie.c 1 addition, 2 deletionsnet/ipv4/fib_trie.c
- net/ipv4/icmp.c 2 additions, 1 deletionnet/ipv4/icmp.c
- net/ipv4/inet_hashtables.c 3 additions, 3 deletionsnet/ipv4/inet_hashtables.c
- net/ipv4/xfrm4_mode_beet.c 1 addition, 1 deletionnet/ipv4/xfrm4_mode_beet.c
Loading
Please register or sign in to comment