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: (30 commits) xfrm: Restrict extended sequence numbers to esp xfrm: Check for esn buffer len in xfrm_new_ae xfrm: Assign esn pointers when cloning a state xfrm: Move the test on replay window size into the replay check functions netdev: bfin_mac: document TE setting in RMII modes drivers net: Fix declaration ordering in inline functions. cxgb3: Apply interrupt coalescing settings to all queues net: Always allocate at least 16 skb frags regardless of page size ipv4: Don't ip_rt_put() an error pointer in RAW sockets. net: fix ethtool->set_flags not intended -EINVAL return value mlx4_en: Fix loss of promiscuity tg3: Fix inline keyword usage tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> net: use CHECKSUM_NONE instead of magic number Net / jme: Do not use legacy PCI power management myri10ge: small rx_done refactoring bridge: notify applications if address of bridge device changes ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo() can: c_can: Fix tx_bytes accounting can: c_can_platform: fix irq check in probe ...
No related branches found
No related tags found
Showing
- drivers/net/bfin_mac.c 11 additions, 2 deletionsdrivers/net/bfin_mac.c
- drivers/net/bnx2.c 1 addition, 1 deletiondrivers/net/bnx2.c
- drivers/net/can/c_can/c_can.c 5 additions, 11 deletionsdrivers/net/can/c_can/c_can.c
- drivers/net/can/c_can/c_can_platform.c 5 additions, 4 deletionsdrivers/net/can/c_can/c_can_platform.c
- drivers/net/cxgb3/cxgb3_main.c 10 additions, 4 deletionsdrivers/net/cxgb3/cxgb3_main.c
- drivers/net/jme.c 16 additions, 14 deletionsdrivers/net/jme.c
- drivers/net/ksz884x.c 1 addition, 1 deletiondrivers/net/ksz884x.c
- drivers/net/mlx4/en_netdev.c 3 additions, 0 deletionsdrivers/net/mlx4/en_netdev.c
- drivers/net/myri10ge/myri10ge.c 23 additions, 14 deletionsdrivers/net/myri10ge/myri10ge.c
- drivers/net/netxen/netxen_nic_ethtool.c 1 addition, 1 deletiondrivers/net/netxen/netxen_nic_ethtool.c
- drivers/net/qlcnic/qlcnic_ethtool.c 1 addition, 1 deletiondrivers/net/qlcnic/qlcnic_ethtool.c
- drivers/net/s2io.c 1 addition, 1 deletiondrivers/net/s2io.c
- drivers/net/tg3.c 3 additions, 3 deletionsdrivers/net/tg3.c
- drivers/net/vmxnet3/vmxnet3_ethtool.c 2 additions, 2 deletionsdrivers/net/vmxnet3/vmxnet3_ethtool.c
- drivers/net/vxge/vxge-ethtool.c 2 additions, 2 deletionsdrivers/net/vxge/vxge-ethtool.c
- include/linux/can/core.h 5 additions, 4 deletionsinclude/linux/can/core.h
- include/linux/ethtool.h 1 addition, 0 deletionsinclude/linux/ethtool.h
- include/linux/skbuff.h 7 additions, 1 deletioninclude/linux/skbuff.h
- include/net/dst.h 1 addition, 1 deletioninclude/net/dst.h
- include/net/rose.h 7 additions, 1 deletioninclude/net/rose.h
Loading
Please register or sign in to comment