Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-04-11

This series contains updates to iflink, ixgbe and ixgbevf.

The entire set of changes come from Vlad Zolotarov to ultimately add
the ethtool ops to VF driver to allow querying the RSS indirection table
and RSS random key.

Currently we support only 82599 and x540 devices.  On those devices, VFs
share the RSS redirection table and hash key with a PF.  Letting the VF
query this information may introduce some security risks, therefore this
feature will be disabled by default.

The new netdev op allows a system administrator to change the default
behaviour with "ip link set" command.  The relevant iproute2 patch has
already been sent and awaits for this series upstream.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 0 deletions

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 7ffb18df01ca..d9cd19214b98 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -465,6 +465,9 @@ enum {
         IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
         IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
         IFLA_VF_RATE,           /* Min and Max TX Bandwidth Allocation */
+        IFLA_VF_RSS_QUERY_EN,   /* RSS Redirection Table and Hash Key query
+                                 * on/off switch
+                                 */
         __IFLA_VF_MAX,
 };
 
@@ -509,6 +512,11 @@ struct ifla_vf_link_state {
         __u32 link_state;
 };
 
+struct ifla_vf_rss_query_en {
+        __u32 vf;
+        __u32 setting;
+};
+
 /* VF ports management section
  *
  *      Nested layout of set/get msg is: