Re: [Xen-devel] [PATCH] linux: adjust Solarflare Kconfig additions

[Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>]

Does this require changing our defconfig files?

 -- Keir

On 21/2/08 09:01, "Jan Beulich" <jbeulich@xxxxxxxxxx> wrote:

> Cleanup drivers/xen/Kconfig after the Solarflare additions:
> - placement of new items should not disturb menu hierarchy
> - dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
> - use tabs for indentation
> 
> As usual, written and tested on 2.6.24.1 and made apply to the 2.6.18
> tree without further testing.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
> 
> Index: head-2008-02-20/drivers/xen/Kconfig
> ===================================================================
> --- head-2008-02-20.orig/drivers/xen/Kconfig 2008-02-20 15:30:01.000000000
> +0100
> +++ head-2008-02-20/drivers/xen/Kconfig 2008-02-20 15:32:18.000000000 +0100
> @@ -30,6 +30,9 @@ config XEN_XENBUS_DEV
> def_bool y
> depends on PROC_FS
>  
> +config XEN_NETDEV_ACCEL_SFC_UTIL
> + tristate
> +
>  config XEN_BACKEND
>          tristate "Backend driver support"
>          default XEN_PRIVILEGED_GUEST
> @@ -79,15 +82,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
>  are unsure; or if you experience network hangs when this option is
>  enabled; then you must say N here.
>  
> -config XEN_NETDEV_ACCEL_SFC_UTIL
> -        tristate
> -        default n
> -
>  config XEN_NETDEV_ACCEL_SFC_BACKEND
> tristate "Network-device backend driver acceleration for Solarflare NICs"
> -        depends on XEN_NETDEV_BACKEND
> -        select XEN_NETDEV_ACCEL_SFC_UTIL
> -        default m
> + depends on SFC && SFC_RESOURCE && XEN_NETDEV_BACKEND
> + select XEN_NETDEV_ACCEL_SFC_UTIL
> + default m
>  
>  config XEN_NETDEV_LOOPBACK
> tristate "Network-device loopback driver"
> @@ -185,6 +184,12 @@ config XEN_NETDEV_FRONTEND
>  dedicated device-driver domain, or your master control domain
>  (domain 0), then you almost certainly want to say Y here.
>  
> +config XEN_NETDEV_ACCEL_SFC_FRONTEND
> + tristate "Network-device frontend driver acceleration for Solarflare NICs"
> + depends on XEN_NETDEV_FRONTEND
> + select XEN_NETDEV_ACCEL_SFC_UTIL
> + default m
> +
>  config XEN_GRANT_DEV
> tristate "User-space granted page access driver"
> default XEN_PRIVILEGED_GUEST
> @@ -192,12 +197,6 @@ config XEN_GRANT_DEV
>  Device for accessing (in user-space) pages that have been granted
>  by other domains.
>  
> -config XEN_NETDEV_ACCEL_SFC_FRONTEND
> - tristate "Network-device frontend driver acceleration for Solarflare NICs"
> - depends on XEN_NETDEV_FRONTEND
> -        select XEN_NETDEV_ACCEL_SFC_UTIL
> - default m
> -
>  config XEN_FRAMEBUFFER
> tristate "Framebuffer-device frontend driver"
> depends on FB
> 
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel