From 9d894a98cf7a6f96be618d4f97a698906bc2ea00 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 24 Feb 2010 22:39:53 -0500 Subject: ethtool-copy.h: import minor reorg and cleanups from net-next Signed-off-by: Jeff Garzik --- ethtool-copy.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'ethtool-copy.h') diff --git a/ethtool-copy.h b/ethtool-copy.h index 77b375d..8681f5e 100644 --- a/ethtool-copy.h +++ b/ethtool-copy.h @@ -365,20 +365,8 @@ struct ethtool_rxnfc { __u32 rule_locs[0]; }; -#define ETHTOOL_FLASH_MAX_FILENAME 128 -enum ethtool_flash_op_type { - ETHTOOL_FLASH_ALL_REGIONS = 0, -}; - -/* for passing firmware flashing related parameters */ -struct ethtool_flash { - __u32 cmd; - __u32 region; - char data[ETHTOOL_FLASH_MAX_FILENAME]; -}; - struct ethtool_rx_ntuple_flow_spec { - int flow_type; + __u32 flow_type; union { struct ethtool_tcpip4_spec tcp_ip4_spec; struct ethtool_tcpip4_spec udp_ip4_spec; @@ -397,7 +385,7 @@ struct ethtool_rx_ntuple_flow_spec { __u64 data_mask; /* user-defined flow spec mask */ /* signed to distinguish between queue and actions (DROP) */ - int action; + __s32 action; #define ETHTOOL_RXNTUPLE_ACTION_DROP -1 }; @@ -408,6 +396,18 @@ struct ethtool_rx_ntuple { struct ethtool_rx_ntuple_flow_spec fs; }; +#define ETHTOOL_FLASH_MAX_FILENAME 128 +enum ethtool_flash_op_type { + ETHTOOL_FLASH_ALL_REGIONS = 0, +}; + +/* for passing firmware flashing related parameters */ +struct ethtool_flash { + __u32 cmd; + __u32 region; + char data[ETHTOOL_FLASH_MAX_FILENAME]; +}; + /* CMDs currently supported */ #define ETHTOOL_GSET 0x00000001 /* Get settings. */ #define ETHTOOL_SSET 0x00000002 /* Set settings. */ -- cgit v1.2.1