Re: [PATCH RFC v2 06/11] backports: igb fixes for linux-3.5

[Stefan Assmann <sassmann@kpanic.de>]

On 18.12.2013 21:35, Hauke Mehrtens wrote:
> On 12/18/2013 05:08 PM, Stefan Assmann wrote:
>> - add EEE defines
>> - add struct ethtool_eee
>> - backport __skb_alloc_page and __skb_alloc_pages
>> - add patches/collateral-evolutions/network/82-ethernet/0006-igb_eee.patch
>>
>> Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
>> ---
>>  backport/backport-include/linux/ethtool.h          | 31 +++++++++++++++
>>  backport/backport-include/linux/gfp.h              | 10 +++++
>>  backport/backport-include/linux/mdio.h             | 23 ++++++++++-
>>  backport/backport-include/linux/skbuff.h           | 46 ++++++++++++++++++++++
>>  .../network/82-ethernet/0006-igb_eee.patch         | 15 +++++++
>>  5 files changed, 124 insertions(+), 1 deletion(-)
>>  create mode 100644 backport/backport-include/linux/gfp.h
>>  create mode 100644 patches/collateral-evolutions/network/82-ethernet/0006-igb_eee.patch
>>
>> diff --git a/backport/backport-include/linux/ethtool.h b/backport/backport-include/linux/ethtool.h
>> index 647fbf6..4f13cb9 100644
>> --- a/backport/backport-include/linux/ethtool.h
>> +++ b/backport/backport-include/linux/ethtool.h
>> @@ -42,4 +42,35 @@ static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
>>  }
>>  #endif
>>  
>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) && LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
>> +/**
>> + * struct ethtool_eee - Energy Efficient Ethernet information
>> + * @cmd: ETHTOOL_{G,S}EEE
>> + * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
>> + *	for which there is EEE support.
>> + * @advertised: Mask of %ADVERTISED_* flags for the speed/duplex combinations
>> + *	advertised as eee capable.
>> + * @lp_advertised: Mask of %ADVERTISED_* flags for the speed/duplex
>> + *	combinations advertised by the link partner as eee capable.
>> + * @eee_active: Result of the eee auto negotiation.
>> + * @eee_enabled: EEE configured mode (enabled/disabled).
>> + * @tx_lpi_enabled: Whether the interface should assert its tx lpi, given
>> + *	that eee was negotiated.
>> + * @tx_lpi_timer: Time in microseconds the interface delays prior to asserting
>> + *	its tx lpi (after reaching 'idle' state). Effective only when eee
>> + *	was negotiated and tx_lpi_enabled was set.
>> + */
>> +struct ethtool_eee {
>> +	__u32	cmd;
>> +	__u32	supported;
>> +	__u32	advertised;
>> +	__u32	lp_advertised;
>> +	__u32	eee_active;
>> +	__u32	eee_enabled;
>> +	__u32	tx_lpi_enabled;
>> +	__u32	tx_lpi_timer;
>> +	__u32	reserved[2];
>> +};
>> +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) && LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
> 
> The get_eee and set_eee callbacks in struct ethtool_ops are not
> available on this kernel, you could also add a #ifdef <kernel version>
> around igb_get_eee() and igb_set_eee() and remove the struct here.

True, but that would result in more ifdefs in igb and I'd like to keep
the number at a minimum. Results in less maintenance work if upstream
changes.

  Stefan