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: (27 commits) slcan: fix ldisc->open retval net/usb: mark LG VL600 LTE modem ethernet interface as WWAN xfrm: Don't allow esn with disabled anti replay detection xfrm: Assign the inner mode output function to the dst entry net: dev_close() should check IFF_UP vlan: fix GVRP at dismantle time netfilter: revert a2361c87 netfilter: IPv6: fix DSCP mangle code netfilter: IPv6: initialize TOS field in REJECT target module IPVS: init and cleanup restructuring IPVS: Change of socket usage to enable name space exit. netfilter: ebtables: only call xt_compat_add_offset once per rule netfilter: fix ebtables compat support netfilter: ctnetlink: fix timestamp support for new conntracks pch_gbe: support ML7223 IOH PCH_GbE : Fixed the issue of checksum judgment PCH_GbE : Fixed the issue of collision detection NET: slip, fix ldisc->open retval be2net: Fixed bugs related to PVID. ehea: fix wrongly reported speed and port ...
Showing
- drivers/net/Kconfig 7 additions, 1 deletiondrivers/net/Kconfig
- drivers/net/benet/be.h 1 addition, 1 deletiondrivers/net/benet/be.h
- drivers/net/benet/be_cmds.c 1 addition, 1 deletiondrivers/net/benet/be_cmds.c
- drivers/net/benet/be_main.c 12 additions, 6 deletionsdrivers/net/benet/be_main.c
- drivers/net/can/sja1000/sja1000.c 1 addition, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/can/slcan.c 3 additions, 1 deletiondrivers/net/can/slcan.c
- drivers/net/ehea/ehea_ethtool.c 13 additions, 8 deletionsdrivers/net/ehea/ehea_ethtool.c
- drivers/net/pch_gbe/pch_gbe_main.c 16 additions, 7 deletionsdrivers/net/pch_gbe/pch_gbe_main.c
- drivers/net/slip.c 3 additions, 1 deletiondrivers/net/slip.c
- drivers/net/usb/cdc_ether.c 1 addition, 1 deletiondrivers/net/usb/cdc_ether.c
- drivers/net/usb/ipheth.c 9 additions, 5 deletionsdrivers/net/usb/ipheth.c
- drivers/net/usb/usbnet.c 7 additions, 3 deletionsdrivers/net/usb/usbnet.c
- drivers/net/vmxnet3/vmxnet3_drv.c 6 additions, 4 deletionsdrivers/net/vmxnet3/vmxnet3_drv.c
- include/net/ip_vs.h 17 additions, 0 deletionsinclude/net/ip_vs.h
- include/net/xfrm.h 3 additions, 0 deletionsinclude/net/xfrm.h
- net/8021q/vlan.c 3 additions, 0 deletionsnet/8021q/vlan.c
- net/8021q/vlan_dev.c 0 additions, 3 deletionsnet/8021q/vlan_dev.c
- net/bridge/netfilter/ebtables.c 11 additions, 53 deletionsnet/bridge/netfilter/ebtables.c
- net/core/dev.c 6 additions, 4 deletionsnet/core/dev.c
- net/dccp/options.c 2 additions, 0 deletionsnet/dccp/options.c
Loading
Please register or sign in to comment