From: Linus Torvalds Date: Sat, 25 Jan 2014 19:17:34 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4ba9920e5e9c0e16b5ed24292d45322907bb9035;p=openwrt%2Fstaging%2Fblogic.git Merge git://git./linux/kernel/git/davem/net-next Pull networking updates from David Miller: 1) BPF debugger and asm tool by Daniel Borkmann. 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann. 3) Correct reciprocal_divide and update users, from Hannes Frederic Sowa and Daniel Borkmann. 4) Currently we only have a "set" operation for the hw timestamp socket ioctl, add a "get" operation to match. From Ben Hutchings. 5) Add better trace events for debugging driver datapath problems, also from Ben Hutchings. 6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we have a small send and a previous packet is already in the qdisc or device queue, defer until TX completion or we get more data. 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko. 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel Borkmann. 9) Share IP header compression code between Bluetooth and IEEE802154 layers, from Jukka Rissanen. 10) Fix ipv6 router reachability probing, from Jiri Benc. 11) Allow packets to be captured on macvtap devices, from Vlad Yasevich. 12) Support tunneling in GRO layer, from Jerry Chu. 13) Allow bonding to be configured fully using netlink, from Scott Feldman. 14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can already get the TCI. From Atzm Watanabe. 15) New "Heavy Hitter" qdisc, from Terry Lam. 16) Significantly improve the IPSEC support in pktgen, from Fan Du. 17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom Herbert. 18) Add Proportional Integral Enhanced packet scheduler, from Vijay Subramanian. 19) Allow openvswitch to mmap'd netlink, from Thomas Graf. 20) Key TCP metrics blobs also by source address, not just destination address. From Christoph Paasch. 21) Support 10G in generic phylib. From Andy Fleming. 22) Try to short-circuit GRO flow compares using device provided RX hash, if provided. From Tom Herbert. The wireless and netfilter folks have been busy little bees too. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits) net/cxgb4: Fix referencing freed adapter ipv6: reallocate addrconf router for ipv6 address when lo device up fib_frontend: fix possible NULL pointer dereference rtnetlink: remove IFLA_BOND_SLAVE definition rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info qlcnic: update version to 5.3.55 qlcnic: Enhance logic to calculate msix vectors. qlcnic: Refactor interrupt coalescing code for all adapters. qlcnic: Update poll controller code path qlcnic: Interrupt code cleanup qlcnic: Enhance Tx timeout debugging. qlcnic: Use bool for rx_mac_learn. bonding: fix u64 division rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC sfc: Use the correct maximum TX DMA ring size for SFC9100 Add Shradha Shah as the sfc driver maintainer. net/vxlan: Share RX skb de-marking and checksum checks with ovs tulip: cleanup by using ARRAY_SIZE() ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called net/cxgb4: Don't retrieve stats during recovery ... --- 4ba9920e5e9c0e16b5ed24292d45322907bb9035 diff --cc arch/cris/include/asm/Kbuild index 199b1a9dab89,406cbd3ebd58..f3fd8768f095 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -3,9 -3,9 +3,10 @@@ header-y += arch-v10 header-y += arch-v32/ +generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h + generic-y += hash.h generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h diff --cc arch/microblaze/include/asm/Kbuild index a82426589fff,ca60945ddf30..2b98bc73642a --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@@ -1,7 -1,7 +1,8 @@@ +generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h + generic-y += hash.h generic-y += trace_clock.h generic-y += syscalls.h generic-y += preempt.h diff --cc arch/mn10300/include/asm/Kbuild index 032143ec2324,199345207d82..992e989ab785 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@@ -1,6 -1,6 +1,7 @@@ +generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h + generic-y += hash.h generic-y += trace_clock.h generic-y += preempt.h diff --cc arch/score/include/asm/Kbuild index fe7471eb0167,1d35e33ccf86..146b9d5e89f8 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@@ -1,8 -1,8 +1,9 @@@ header-y += +generic-y += barrier.h generic-y += clkdev.h + generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h diff --cc include/linux/mlx4/cq.h index e1862997f933,5dd0d70a0689..e7ecc12a1163 --- a/include/linux/mlx4/cq.h +++ b/include/linux/mlx4/cq.h @@@ -87,9 -81,13 +87,14 @@@ struct mlx4_ts_cqe } __packed; enum { + MLX4_CQE_L2_TUNNEL_IPOK = 1 << 31, MLX4_CQE_VLAN_PRESENT_MASK = 1 << 29, + MLX4_CQE_L2_TUNNEL = 1 << 27, + MLX4_CQE_L2_TUNNEL_CSUM = 1 << 26, + MLX4_CQE_L2_TUNNEL_IPV4 = 1 << 25, + MLX4_CQE_QPN_MASK = 0xffffff, + MLX4_CQE_VID_MASK = 0xfff, }; enum { diff --cc include/linux/mlx4/device.h index ac5cb1d92487,c99ecf6d2c67..5edd2c68274d --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@@ -161,7 -166,7 +166,8 @@@ enum MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 1LL << 6, MLX4_DEV_CAP_FLAG2_FSM = 1LL << 7, MLX4_DEV_CAP_FLAG2_UPDATE_QP = 1LL << 8, - MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 9 - MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 9 ++ MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 9, ++ MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 10, }; enum { @@@ -1096,7 -1130,7 +1131,8 @@@ int mlx4_SET_PORT_qpn_calc(struct mlx4_ int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc); int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw, u8 *pg, u16 *ratelimit); + int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering); +int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx); int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx); int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index); void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);