[openfabrics-ewg] [PATCH] OFED 1.2 is broken on SLES 10 sp1 beta 2

[Erez Zilber]

Preggna S wrote:
> Hi,
> 
> Apparently netif_tx_lock and netif_tx_unlock definitions are already part of sles10_sp1_beta2 kernel header files. Here is the patch that removes these function definitions from the backport patches.
> 
> thanks & regards,
> Preggna
> 
> Signed-off by SPreggna at novell.com
> 
> --- ofa_kernel-1.2/kernel_addons/backport/2.6.16_sles10/include/linux/netdevice.h       2007-02-07 22:35:10.000000000 +0530
> +++ ofa_kernel-1.2_new/kernel_addons/backport/2.6.16_sles10/include/linux/netdevice.h   2007-02-07 22:39:48.000000000 +0530
> @@ -3,18 +3,6 @@
> 
>  #include_next <linux/netdevice.h>
> 
> -static inline void netif_tx_lock(struct net_device *dev)
> -{
> -       spin_lock(&dev->xmit_lock);
> -       dev->xmit_lock_owner = smp_processor_id();
> -}
> -
> -static inline void netif_tx_unlock(struct net_device *dev)
> -{
> -       dev->xmit_lock_owner = -1;
> -       spin_unlock(&dev->xmit_lock);
> -}
> -
>  #undef SET_ETHTOOL_OPS
>  #define SET_ETHTOOL_OPS(netdev, ops) \
>         (netdev)->ethtool_ops = (struct ethtool_ops *)(ops)
> 
> 
> 
> 

I guess that this fix is ok for SLES 10 sp1. However, now it will fail on the original SLES 10 kernel (that does not have netif_tx_lock and netif_tx_unlock). Am I right? 

Anyway, it is still broken (now in cma.c):

  gcc -Wp,-MD,/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core/.cma.o.d  -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.1.2/include -D__KERNEL__ -I/tmp/ofa_1_2_kernel-20070131-0520/kernel_addons/backport/2.6.16_sles10/include/  -I/tmp/ofa_1_2_kernel-20070131-0520/include  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/include  -Iinclude  -Iinclude2 -I/usr/src/linux-2.6.16.37-0.9/include  -include include/linux/autoconf.h  -include /tmp/ofa_1_2_kernel-20070131-0520/include/linux/autoconf.h    -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core  -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -fno-common -ffreestanding -Os -fomit-frame-pointer -mtune=generic -m64 -mno-red-zone -mcmodel=kernel -pipe -fno-reorder-blocks -Wno-sign-compare -fno-asynchronous-unwind-tables -funit-at-a-time -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -Wdeclaration-after-statement -Wno-pointer-sign -I/tmp/ofa_1_2_ke
rnel-20070131-0520/include  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/include  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/ulp/ipoib  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/debug  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/hw/cxgb3/core  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/net/cxgb3  -I/tmp/ofa_1_2_kernel-20070131-0520/drivers/net/rds  -DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(cma)"  -D"KBUILD_MODNAME=KBUILD_STR(rdma_cm)" -c -o /tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core/.tmp_cma.o /tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core/cma.c
In file included from /tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core/cma.c:40:
/usr/src/linux-2.6.16.37-0.9/include/net/tcp.h: In function ?tcp_skb_mss?:
/usr/src/linux-2.6.16.37-0.9/include/net/tcp.h:565: error: ?struct skb_shared_info? has no member named ?tso_size
make[6]: *** [/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core/cma.o] Error 1
make[5]: *** [/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband/core] Error 2
make[4]: *** [/tmp/ofa_1_2_kernel-20070131-0520/drivers/infiniband] Error 2
make[3]: *** [_module_/tmp/ofa_1_2_kernel-20070131-0520] Error 2
make[2]: *** [modules] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.16.37-0.9-obj/x86_64/smp'
make: *** [kernel] Error 2

-- 
____________________________________________________________

Erez Zilber   |  972-9-971-7689

Software Engineer, Storage Team

Voltaire – _The Grid Backbone_

 __

 www.voltaire.com <http://www.voltaire.com/>

<mailto:g at voltaire.com>