Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / include / linux / ethtool.h

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 4194a2067a1475dcb85d786be94cd1bf578312c4..c6a850ab2ec5b6f0f8b2fdc75a8dec25510ffc0e 100644 (file)
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -601,6 +601,26 @@ struct ethtool_flash {
        char    data[ETHTOOL_FLASH_MAX_FILENAME];
 };
 
+/**
+ * struct ethtool_dump - used for retrieving, setting device dump
+ * @cmd: Command number - %ETHTOOL_GET_DUMP_FLAG, %ETHTOOL_GET_DUMP_DATA, or
+ *     %ETHTOOL_SET_DUMP
+ * @version: FW version of the dump, filled in by driver
+ * @flag: driver dependent flag for dump setting, filled in by driver during
+ *       get and filled in by ethtool for set operation
+ * @len: length of dump data, used as the length of the user buffer on entry to
+ *      %ETHTOOL_GET_DUMP_DATA and this is returned as dump length by driver
+ *      for %ETHTOOL_GET_DUMP_FLAG command
+ * @data: data collected for get dump data operation
+ */
+struct ethtool_dump {
+       __u32   cmd;
+       __u32   version;
+       __u32   flag;
+       __u32   len;
+       __u8    data[0];
+};
+
 /* for returning and changing feature sets */
 
 /**
@@ -814,12 +834,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
  *     the indicator accordingly.  Finally, it is called with the argument
  *     %ETHTOOL_ID_INACTIVE and must deactivate the indicator.  Returns a
  *     negative error code or zero.
- * @phys_id: Deprecated in favour of @set_phys_id.
- *     Identify the physical device, e.g. by flashing an LED
- *     attached to it until interrupted by a signal or the given time
- *     (in seconds) elapses.  If the given time is zero, use a default
- *     time limit.  Returns a negative error code or zero.  Being
- *     interrupted by a signal is not an error.
  * @get_ethtool_stats: Return extended statistics about the device.
  *     This is only useful if the device maintains statistics not
  *     included in &struct rtnl_link_stats64.
@@ -859,6 +873,10 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
  * @get_channels: Get number of channels.
  * @set_channels: Set number of channels.  Returns a negative error code or
  *     zero.
+ * @get_dump_flag: Get dump flag indicating current dump length, version,
+ *                and flag of the device.
+ * @get_dump_data: Get dump data.
+ * @set_dump: Set dump specific flags to the device.
  *
  * All operations are optional (i.e. the function pointer may be set
  * to %NULL) and callers must take this into account.  Callers must
@@ -908,7 +926,6 @@ struct ethtool_ops {
        void    (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
        void    (*get_strings)(struct net_device *, u32 stringset, u8 *);
        int     (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state);
-       int     (*phys_id)(struct net_device *, u32);
        void    (*get_ethtool_stats)(struct net_device *,
                                     struct ethtool_stats *, u64 *);
        int     (*begin)(struct net_device *);
@@ -934,6 +951,10 @@ struct ethtool_ops {
                                  const struct ethtool_rxfh_indir *);
        void    (*get_channels)(struct net_device *, struct ethtool_channels *);
        int     (*set_channels)(struct net_device *, struct ethtool_channels *);
+       int     (*get_dump_flag)(struct net_device *, struct ethtool_dump *);
+       int     (*get_dump_data)(struct net_device *,
+                                struct ethtool_dump *, void *);
+       int     (*set_dump)(struct net_device *, struct ethtool_dump *);
 
 };
 #endif /* __KERNEL__ */
@@ -1005,6 +1026,9 @@ struct ethtool_ops {
 #define ETHTOOL_SFEATURES      0x0000003b /* Change device offload settings */
 #define ETHTOOL_GCHANNELS      0x0000003c /* Get no of channels */
 #define ETHTOOL_SCHANNELS      0x0000003d /* Set no of channels */
+#define ETHTOOL_SET_DUMP       0x0000003e /* Set dump settings */
+#define ETHTOOL_GET_DUMP_FLAG  0x0000003f /* Get dump settings */
+#define ETHTOOL_GET_DUMP_DATA  0x00000040 /* Get dump data */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET         ETHTOOL_GSET
@@ -1032,6 +1056,8 @@ struct ethtool_ops {
 #define SUPPORTED_10000baseKX4_Full    (1 << 18)
 #define SUPPORTED_10000baseKR_Full     (1 << 19)
 #define SUPPORTED_10000baseR_FEC       (1 << 20)
+#define SUPPORTED_20000baseMLD2_Full   (1 << 21)
+#define SUPPORTED_20000baseKR2_Full    (1 << 22)
 
 /* Indicates what features are advertised by the interface. */
 #define ADVERTISED_10baseT_Half                (1 << 0)
@@ -1055,6 +1081,8 @@ struct ethtool_ops {
 #define ADVERTISED_10000baseKX4_Full   (1 << 18)
 #define ADVERTISED_10000baseKR_Full    (1 << 19)
 #define ADVERTISED_10000baseR_FEC      (1 << 20)
+#define ADVERTISED_20000baseMLD2_Full  (1 << 21)
+#define ADVERTISED_20000baseKR2_Full   (1 << 22)
 
 /* The following are all involved in forcing a particular link
  * mode for the device for setting things.  When getting the