Re: [PATCH RFC 01/10] backports: add igb ethernet network driver

[Hauke Mehrtens <hauke@hauke-m.de>]

On 12/12/2013 10:27 AM, Stefan Assmann wrote:
> - add igb to copy-list
> - add igb defconfig
> - refactor u64_stats_sync.h a bit
> - add u64_stats_init define
> 
> Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
> ---
>  backport/backport-include/linux/u64_stats_sync.h | 16 ++++++++++++++--
>  backport/defconfigs/igb                          |  7 +++++++
>  copy-list                                        |  4 ++++
>  3 files changed, 25 insertions(+), 2 deletions(-)
>  create mode 100644 backport/defconfigs/igb
> 
> diff --git a/backport/backport-include/linux/u64_stats_sync.h b/backport/backport-include/linux/u64_stats_sync.h
> index f15116c..ce6b778 100644
> --- a/backport/backport-include/linux/u64_stats_sync.h
> +++ b/backport/backport-include/linux/u64_stats_sync.h
> @@ -1,6 +1,17 @@
> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
> +#ifndef __BACKPORT_LINUX_U64_STATS_SYNC_H
> +#define __BACKPORT_LINUX_U64_STATS_SYNC_H
> +
>  #include_next <linux/u64_stats_sync.h>
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
> +#if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
> +# define u64_stats_init(syncp)	seqcount_init(syncp.seq)
>  #else
> +# define u64_stats_init(syncp)	do { } while (0)
> +#endif
> +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) */
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
>  #ifndef _LINUX_U64_STATS_SYNC_H
>  #define _LINUX_U64_STATS_SYNC_H
>  
> @@ -141,4 +152,5 @@ static inline bool u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
>  }
>  
>  #endif /* _LINUX_U64_STATS_SYNC_H */
> -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */
> +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
> +#endif /* __BACKPORT_LINUX_U64_STATS_SYNC_H */
> diff --git a/backport/defconfigs/igb b/backport/defconfigs/igb
> new file mode 100644
> index 0000000..1f85f18
> --- /dev/null
> +++ b/backport/defconfigs/igb
> @@ -0,0 +1,7 @@
> +CPTCFG_NETDEVICES=y
> +CPTCFG_NET_ETHERNET=y
> +CPTCFG_NETDEV_1000=y
> +CPTCFG_ETHERNET=y
> +CPTCFG_NET_VENDOR_INTEL=y
> +CPTCFG_PCI=y
> +CPTCFG_IGB=m

PCI should not be selected here, because it has to be selected in the
kernel you are compiling against. I have not analyzed this, but I thing
the defconfig should just contain these two options, the others should
be already activated in the kernel:

CPTCFG_NET_VENDOR_INTEL=y
CPTCFG_IGB=m

> diff --git a/copy-list b/copy-list
> index 9444aff..2b2e177 100644
> --- a/copy-list
> +++ b/copy-list
> @@ -100,6 +100,10 @@ drivers/net/ethernet/broadcom/Makefile
>  drivers/net/ethernet/broadcom/b44.c
>  drivers/net/ethernet/broadcom/b44.h
>  
> +drivers/net/ethernet/intel/Kconfig
> +drivers/net/ethernet/intel/Makefile
> +drivers/net/ethernet/intel/igb/
> +

This should be added in the last patch otherwise backports will not
compile between this patch and the last one, becaise some parts are missing.

>  # wwan drivers
>  include/uapi/linux/usb/cdc.h
>  include/uapi/linux/usb/cdc-wdm.h
>