diff output between ethtool.h for linux-headers-2.6.8.1-r2

ethtool.h_diff (text/plain), 7.47 KB, created by Ryan Lynch on 2005-04-07 10:30:59 UTC

#output of diff between ethtool.h from january 2005 ( < ) and ethtool.h from april 1st 2005 ( > )

18,29c18,29
< 	u32	cmd;
< 	u32	supported;	/* Features this interface supports */
< 	u32	advertising;	/* Features this interface advertises */
< 	u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
< 	u8	duplex;		/* Duplex, half or full */
< 	u8	port;		/* Which connector port */
< 	u8	phy_address;
< 	u8	transceiver;	/* Which transceiver to use */
< 	u8	autoneg;	/* Enable or disable autonegotiation */
< 	u32	maxtxpkt;	/* Tx pkts before generating tx int */
< 	u32	maxrxpkt;	/* Rx pkts before generating rx int */
< 	u32	reserved[4];
---
> 	__u32	cmd;
> 	__u32	supported;	/* Features this interface supports */
> 	__u32	advertising;	/* Features this interface advertises */
> 	__u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
> 	__u8	duplex;		/* Duplex, half or full */
> 	__u8	port;		/* Which connector port */
> 	__u8	phy_address;
> 	__u8	transceiver;	/* Which transceiver to use */
> 	__u8	autoneg;	/* Enable or disable autonegotiation */
> 	__u32	maxtxpkt;	/* Tx pkts before generating tx int */
> 	__u32	maxrxpkt;	/* Rx pkts before generating rx int */
> 	__u32	reserved[4];
35c35
< 	u32	cmd;
---
> 	__u32	cmd;
43,46c43,46
< 	u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
< 	u32	testinfo_len;
< 	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
< 	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
---
> 	__u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
> 	__u32	testinfo_len;
> 	__u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
> 	__u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
52,55c52,55
< 	u32	cmd;
< 	u32	supported;
< 	u32	wolopts;
< 	u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
---
> 	__u32	cmd;
> 	__u32	supported;
> 	__u32	wolopts;
> 	__u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
60,61c60,61
< 	u32	cmd;
< 	u32	data;
---
> 	__u32	cmd;
> 	__u32	data;
66,69c66,69
< 	u32	cmd;
< 	u32	version; /* driver-specific, indicates different chips/revs */
< 	u32	len; /* bytes */
< 	u8	data[0];
---
> 	__u32	cmd;
> 	__u32	version; /* driver-specific, indicates different chips/revs */
> 	__u32	len; /* bytes */
> 	__u8	data[0];
74,78c74,78
< 	u32	cmd;
< 	u32	magic;
< 	u32	offset; /* in bytes */
< 	u32	len; /* in bytes */
< 	u8	data[0];
---
> 	__u32	cmd;
> 	__u32	magic;
> 	__u32	offset; /* in bytes */
> 	__u32	len; /* in bytes */
> 	__u8	data[0];
83c83
< 	u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
---
> 	__u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
89c89
< 	u32	rx_coalesce_usecs;
---
> 	__u32	rx_coalesce_usecs;
97c97
< 	u32	rx_max_coalesced_frames;
---
> 	__u32	rx_max_coalesced_frames;
104,105c104,105
< 	u32	rx_coalesce_usecs_irq;
< 	u32	rx_max_coalesced_frames_irq;
---
> 	__u32	rx_coalesce_usecs_irq;
> 	__u32	rx_max_coalesced_frames_irq;
111c111
< 	u32	tx_coalesce_usecs;
---
> 	__u32	tx_coalesce_usecs;
119c119
< 	u32	tx_max_coalesced_frames;
---
> 	__u32	tx_max_coalesced_frames;
126,127c126,127
< 	u32	tx_coalesce_usecs_irq;
< 	u32	tx_max_coalesced_frames_irq;
---
> 	__u32	tx_coalesce_usecs_irq;
> 	__u32	tx_max_coalesced_frames_irq;
134c134
< 	u32	stats_block_coalesce_usecs;
---
> 	__u32	stats_block_coalesce_usecs;
143,144c143,144
< 	u32	use_adaptive_rx_coalesce;
< 	u32	use_adaptive_tx_coalesce;
---
> 	__u32	use_adaptive_rx_coalesce;
> 	__u32	use_adaptive_tx_coalesce;
150,154c150,154
< 	u32	pkt_rate_low;
< 	u32	rx_coalesce_usecs_low;
< 	u32	rx_max_coalesced_frames_low;
< 	u32	tx_coalesce_usecs_low;
< 	u32	tx_max_coalesced_frames_low;
---
> 	__u32	pkt_rate_low;
> 	__u32	rx_coalesce_usecs_low;
> 	__u32	rx_max_coalesced_frames_low;
> 	__u32	tx_coalesce_usecs_low;
> 	__u32	tx_max_coalesced_frames_low;
165,169c165,169
< 	u32	pkt_rate_high;
< 	u32	rx_coalesce_usecs_high;
< 	u32	rx_max_coalesced_frames_high;
< 	u32	tx_coalesce_usecs_high;
< 	u32	tx_max_coalesced_frames_high;
---
> 	__u32	pkt_rate_high;
> 	__u32	rx_coalesce_usecs_high;
> 	__u32	rx_max_coalesced_frames_high;
> 	__u32	tx_coalesce_usecs_high;
> 	__u32	tx_max_coalesced_frames_high;
174c174
< 	u32	rate_sample_interval;
---
> 	__u32	rate_sample_interval;
179c179
< 	u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
---
> 	__u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
185,188c185,188
< 	u32	rx_max_pending;
< 	u32	rx_mini_max_pending;
< 	u32	rx_jumbo_max_pending;
< 	u32	tx_max_pending;
---
> 	__u32	rx_max_pending;
> 	__u32	rx_mini_max_pending;
> 	__u32	rx_jumbo_max_pending;
> 	__u32	tx_max_pending;
193,196c193,196
< 	u32	rx_pending;
< 	u32	rx_mini_pending;
< 	u32	rx_jumbo_pending;
< 	u32	tx_pending;
---
> 	__u32	rx_pending;
> 	__u32	rx_mini_pending;
> 	__u32	rx_jumbo_pending;
> 	__u32	tx_pending;
201c201
< 	u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
---
> 	__u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
213,215c213,215
< 	u32	autoneg;
< 	u32	rx_pause;
< 	u32	tx_pause;
---
> 	__u32	autoneg;
> 	__u32	rx_pause;
> 	__u32	tx_pause;
226,229c226,229
< 	u32	cmd;		/* ETHTOOL_GSTRINGS */
< 	u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
< 	u32	len;		/* number of strings in the string set */
< 	u8	data[0];
---
> 	__u32	cmd;		/* ETHTOOL_GSTRINGS */
> 	__u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
> 	__u32	len;		/* number of strings in the string set */
> 	__u8	data[0];
239,243c239,243
< 	u32	cmd;		/* ETHTOOL_TEST */
< 	u32	flags;		/* ETH_TEST_FL_xxx */
< 	u32	reserved;
< 	u32	len;		/* result length, in number of u64 elements */
< 	u64	data[0];
---
> 	__u32	cmd;		/* ETHTOOL_TEST */
> 	__u32	flags;		/* ETH_TEST_FL_xxx */
> 	__u32	reserved;
> 	__u32	len;		/* result length, in number of __u64 elements */
> 	__u64	data[0];
248,250c248,250
< 	u32	cmd;		/* ETHTOOL_GSTATS */
< 	u32	n_stats;	/* number of u64's being returned */
< 	u64	data[0];
---
> 	__u32	cmd;		/* ETHTOOL_GSTATS */
> 	__u32	n_stats;	/* number of u64's being returned */
> 	__u64	data[0];
258c258
< int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
---
> int ethtool_op_set_tx_csum(struct net_device *dev, __u32 data);
260c260
< int ethtool_op_set_sg(struct net_device *dev, u32 data);
---
> int ethtool_op_set_sg(struct net_device *dev, __u32 data);
262c262
< int ethtool_op_set_tso(struct net_device *dev, u32 data);
---
> int ethtool_op_set_tso(struct net_device *dev, __u32 data);
327c327
< 	u32	(*get_msglevel)(struct net_device *);
---
> 	__u32	(*get_msglevel)(struct net_device *);
330c330
< 	u32	(*get_link)(struct net_device *);
---
> 	__u32	(*get_link)(struct net_device *);
332,333c332,333
< 	int	(*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
< 	int	(*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
---
> 	int	(*get_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
> 	int	(*set_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
340c340
< 	u32	(*get_rx_csum)(struct net_device *);
---
> 	__u32	(*get_rx_csum)(struct net_device *);
342c342
< 	u32	(*get_tx_csum)(struct net_device *);
---
> 	__u32	(*get_tx_csum)(struct net_device *);
344c344
< 	u32	(*get_sg)(struct net_device *);
---
> 	__u32	(*get_sg)(struct net_device *);
346c346
< 	u32	(*get_tso)(struct net_device *);
---
> 	__u32	(*get_tso)(struct net_device *);
349,350c349,350
< 	void	(*self_test)(struct net_device *, struct ethtool_test *, u64 *);
< 	void	(*get_strings)(struct net_device *, u32 stringset, u8 *);
---
> 	void	(*self_test)(struct net_device *, struct ethtool_test *, __u64 *);
> 	void	(*get_strings)(struct net_device *, __u32 stringset, __u8 *);
353c353
< 	void	(*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
---
> 	void	(*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, __u64 *);