From: David S. Miller Date: Tue, 5 Jul 2016 07:06:03 +0000 (-0700) Subject: Merge branch 'mlx5-ntuple-steering' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=487884eb0c33f4cbf9c3f69fb318fe5897ac2981;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'mlx5-ntuple-steering' Saeed Mahameed says: ==================== Mellanox 100G mlx5 ethtool ntuple steering This series adds Ethernet ethtool ntuple steering 'ethtool -N|U' and exposes two more counter sets to Ethtool statistics, RDMA vport and global flow control statistics. We start from three refactoring patches of the flow steering infrastructure - mlx5_add_flow_rule will now receive mlx5 flow spec to simplify and reduce number of parameters - All low level steering objects are now wrapped in mlx5_flow_steering structure for better encapsulation - Flow steering object will now be removed properly and generically rather than traversing on a well-known steering tree objects Patch#4 adds the infrastructure and the data structures needed for the ethtool ntuple steering, all implemented in a new file 'en_fs_ethtool.c'. Add the support for set_rxnfc ethtool callback to add/remove/replace a flow spec of ethter type L2. Patch#5 adds the support for L3/L4 flow specs and a higher priority in favor for L3/L4 rules when interleaving with L2 rules. Patch#6 adds the support for get_rxnfc ethtool callback. Patch#7,8 adds RDMA vport and global flow control statistics. Applied on top: 8186f6e382d8 ('net-next: mediatek: fix compile error inside mtk_poll_controller()') ==================== Signed-off-by: David S. Miller --- 487884eb0c33f4cbf9c3f69fb318fe5897ac2981