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: (56 commits) route: Take the right src and dst addresses in ip_route_newports ipv4: Fix nexthop caching wrt. scoping. ipv4: Invalidate nexthop cache nh_saddr more correctly. net: fix pch_gbe section mismatch warning ipv4: fix fib metrics mlx4_en: Removing HW info from ethtool -i report. net_sched: fix THROTTLED/RUNNING race drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region bonding: fix rx_handler locking myri10ge: fix rmmod crash mlx4_en: updated driver version to 1.5.4.1 mlx4_en: Using blue flame support mlx4_core: reserve UARs for userspace consumers mlx4_core: maintain available field in bitmap allocator mlx4: Add blue flame support for kernel consumers mlx4_en: Enabling new steering mlx4: Add support for promiscuous mode in the new steering model. mlx4: generalization of multicast steering. mlx4_en: Reporting HW revision in ethtool -i ...
Showing
- drivers/infiniband/hw/mlx4/main.c 5 additions, 6 deletionsdrivers/infiniband/hw/mlx4/main.c
- drivers/net/a2065.c 5 additions, 5 deletionsdrivers/net/a2065.c
- drivers/net/ariadne.c 5 additions, 5 deletionsdrivers/net/ariadne.c
- drivers/net/bonding/bond_main.c 31 additions, 25 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bonding.h 1 addition, 0 deletionsdrivers/net/bonding/bonding.h
- drivers/net/davinci_cpdma.c 8 additions, 3 deletionsdrivers/net/davinci_cpdma.c
- drivers/net/davinci_cpdma.h 1 addition, 0 deletionsdrivers/net/davinci_cpdma.h
- drivers/net/davinci_emac.c 4 additions, 1 deletiondrivers/net/davinci_emac.c
- drivers/net/mlx4/alloc.c 13 additions, 0 deletionsdrivers/net/mlx4/alloc.c
- drivers/net/mlx4/cq.c 1 addition, 1 deletiondrivers/net/mlx4/cq.c
- drivers/net/mlx4/en_cq.c 31 additions, 7 deletionsdrivers/net/mlx4/en_cq.c
- drivers/net/mlx4/en_ethtool.c 62 additions, 4 deletionsdrivers/net/mlx4/en_ethtool.c
- drivers/net/mlx4/en_main.c 12 additions, 10 deletionsdrivers/net/mlx4/en_main.c
- drivers/net/mlx4/en_netdev.c 152 additions, 47 deletionsdrivers/net/mlx4/en_netdev.c
- drivers/net/mlx4/en_port.c 10 additions, 3 deletionsdrivers/net/mlx4/en_port.c
- drivers/net/mlx4/en_port.h 14 additions, 5 deletionsdrivers/net/mlx4/en_port.h
- drivers/net/mlx4/en_rx.c 1 addition, 10 deletionsdrivers/net/mlx4/en_rx.c
- drivers/net/mlx4/en_tx.c 52 additions, 20 deletionsdrivers/net/mlx4/en_tx.c
- drivers/net/mlx4/eq.c 101 additions, 6 deletionsdrivers/net/mlx4/eq.c
- drivers/net/mlx4/fw.c 25 additions, 0 deletionsdrivers/net/mlx4/fw.c
Loading
Please register or sign in to comment