imported patch solarflare-sfc

diff --git a/buildconfigs/conf.linux/solarflare-sfc b/buildconfigs/conf.linux/solarflare-sfc
new file mode 100644 (file)
index 0000000..e916516
--- /dev/null
+++ b/buildconfigs/conf.linux/solarflare-sfc
@@ -0,0 +1,6 @@
+CONFIG_SFC=m
+CONFIG_SFC_MTD=m
+CONFIG_SFC_RESOURCE=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND=m

diff --git a/drivers/net/sfc/kernel_compat.h b/drivers/net/sfc/kernel_compat.h
index a0ac20358261a11c01283e228b39487d20f12e41..77da5a871410a440ec88db9420e1b809be205018 100644 (file)
--- a/drivers/net/sfc/kernel_compat.h
+++ b/drivers/net/sfc/kernel_compat.h
@@ -399,6 +399,9 @@
                for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
 #endif
 
+#undef EFX_NEED_IRQ_HANDLER_T
+#undef EFX_NEED_HEX_DUMP
+
 /**************************************************************************/
 
 #ifdef EFX_NEED_IRQ_HANDLER_T

diff --git a/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h b/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
index 81a065bc7ddbf2827b2a4d67464d2f13b0ae9e72..2d5cc8b99a7b8c550818a974f214bb8f36aad043 100644 (file)
--- a/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
+++ b/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
@@ -59,7 +59,7 @@
 # define PRIx64 "llx"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+#if 0 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 enum {
        false = 0,
        true = 1

diff --git a/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h b/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
index aeaccf0fd72410fc22c186717ad0b63fe7a03485..d8c068feab892f443aabf553442fc63bac3995db 100644 (file)
--- a/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
+++ b/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
@@ -55,7 +55,7 @@
 #define PRIx64 "llx"
 
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+#if 0 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 enum {
        false = 0,
        true = 1