Hello community,
here is the log from the commit of package ofed
checked in at Fri Aug 24 01:51:04 CEST 2007.
--------
--- ofed/ofed.changes 2007-08-13 15:52:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/ofed/ofed.changes 2007-08-20 21:38:36.000000000 +0200
@@ -2 +2 @@
-Mon Aug 13 15:49:34 CEST 2007 - kejohnson@suse.de
+Mon Aug 20 21:37:16 CEST 2007 - hvogel@suse.de
@@ -4 +4,2 @@
-- Update to OFED 1.2.c-11
+- Update to OFED 1.2.5 version
+- enabled mlx4 module build
Old:
----
ofa_kernel-1.2.c.tgz
ofed-docs-1.2.tar.bz2
New:
----
ofa_kernel-1.2.5.tgz
ofed-docs-1.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ofed.spec ++++++
--- /var/tmp/diff_new_pack.R21388/_old 2007-08-24 01:50:27.000000000 +0200
+++ /var/tmp/diff_new_pack.R21388/_new 2007-08-24 01:50:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ofed (Version 1.2)
+# spec file for package ofed (Version 1.2.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,14 +14,14 @@
Name: ofed
Group: System/Base
Summary: Infiniband Kernel Modules
-Version: 1.2
-Release: 8
-Source: ofa_kernel-1.2.c.tgz
+Version: 1.2.5
+Release: 1
+Source: ofa_kernel-1.2.5.tgz
Source1: conf.modutils
Source2: conf.ifcfg
Source3: conf.sysconfig
Source4: info
-Source5: ofed-docs-1.2.tar.bz2
+Source5: ofed-docs-1.2.5.tar.bz2
Patch0: ofed-1.2-init.patch
URL: http://www.openfabrics.org
License: GPL v2 or later
@@ -32,7 +32,7 @@
%suse_kernel_module_package um xen xenpae iseries64
%description
-This package contains infiniband kernel modules build from the
+This package contains infiniband kernel modules built from the
OpenFabrics Enterprise Distribution (OFED).
@@ -51,13 +51,13 @@
Group: System/Base
%description KMP
-This package contains infiniband kernel modules build from the
+This package contains infiniband kernel modules built from the
OpenFabrics Enterprise Distribution (OFED).
%prep
-%setup -q -n ofa_kernel-1.2.c -a 5
+%setup -q -n ofa_kernel-1.2.5 -a 5
%patch0
set -- *
mkdir source
@@ -136,11 +136,12 @@
%files doc
%defattr(-, root, root)
-%doc source/ofed-docs-1.2/*
+%doc source/ofed-docs-1.2.5/*
%changelog
-* Mon Aug 13 2007 - kejohnson@suse.de
-- Update to OFED 1.2.c-11
+* Mon Aug 20 2007 - hvogel@suse.de
+- Update to OFED 1.2.5 version
+- enabled mlx4 module build
- Added ppc64 and ia64 to exclusivearch
- Added %%preun stop_on_removal
* Tue Aug 07 2007 - hvogel@suse.de
++++++ ofa_kernel-1.2.c.tgz -> ofa_kernel-1.2.5.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/BUILD_ID new/ofa_kernel-1.2.5/BUILD_ID
--- old/ofa_kernel-1.2.c/BUILD_ID 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/BUILD_ID 2007-08-14 17:35:22.000000000 +0200
@@ -1,3 +1,3 @@
Git:
git://git.openfabrics.org/ofed_1_2/linux-2.6.git ofed_1_2_c
-commit c5e6c31f7592f600df3c9517e1bd51086cac84b7
+commit 21ec9ff84cba24ea6e53a268da21a72e6ab190d0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/logs/HEAD new/ofa_kernel-1.2.5/.git/logs/HEAD
--- old/ofa_kernel-1.2.c/.git/logs/HEAD 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/logs/HEAD 2007-08-14 17:35:20.000000000 +0200
@@ -1 +1 @@
-66efc5a7e3061c3597ac43a8bb1026488d57e66b c5e6c31f7592f600df3c9517e1bd51086cac84b7 Vladimir Sokolovsky 1186495912 -0700
+66efc5a7e3061c3597ac43a8bb1026488d57e66b 21ec9ff84cba24ea6e53a268da21a72e6ab190d0 Vladimir Sokolovsky 1187105720 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/logs/refs/heads/master new/ofa_kernel-1.2.5/.git/logs/refs/heads/master
--- old/ofa_kernel-1.2.c/.git/logs/refs/heads/master 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/logs/refs/heads/master 2007-08-14 17:35:20.000000000 +0200
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000 66efc5a7e3061c3597ac43a8bb1026488d57e66b Vladimir Sokolovsky 1186495907 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
-66efc5a7e3061c3597ac43a8bb1026488d57e66b c5e6c31f7592f600df3c9517e1bd51086cac84b7 Vladimir Sokolovsky 1186495912 -0700
+0000000000000000000000000000000000000000 66efc5a7e3061c3597ac43a8bb1026488d57e66b Vladimir Sokolovsky 1187105707 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
+66efc5a7e3061c3597ac43a8bb1026488d57e66b 21ec9ff84cba24ea6e53a268da21a72e6ab190d0 Vladimir Sokolovsky 1187105720 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/logs/refs/heads/ofed_1_2 new/ofa_kernel-1.2.5/.git/logs/refs/heads/ofed_1_2
--- old/ofa_kernel-1.2.c/.git/logs/refs/heads/ofed_1_2 2007-08-07 16:11:47.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/logs/refs/heads/ofed_1_2 2007-08-14 17:35:07.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 948b7f77dfbf8e12c62772e7e706dae533716f05 Vladimir Sokolovsky 1186495907 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
+0000000000000000000000000000000000000000 71a6a9d52af72b198257e609026bfd0090cbd842 Vladimir Sokolovsky 1187105707 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/logs/refs/heads/ofed_1_2_c new/ofa_kernel-1.2.5/.git/logs/refs/heads/ofed_1_2_c
--- old/ofa_kernel-1.2.c/.git/logs/refs/heads/ofed_1_2_c 2007-08-07 16:11:47.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/logs/refs/heads/ofed_1_2_c 2007-08-14 17:35:07.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 c5e6c31f7592f600df3c9517e1bd51086cac84b7 Vladimir Sokolovsky 1186495907 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
+0000000000000000000000000000000000000000 21ec9ff84cba24ea6e53a268da21a72e6ab190d0 Vladimir Sokolovsky 1187105707 -0700 clone: from git://git.openfabrics.org/ofed_1_2/linux-2.6.git
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/refs/heads/master new/ofa_kernel-1.2.5/.git/refs/heads/master
--- old/ofa_kernel-1.2.c/.git/refs/heads/master 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/refs/heads/master 2007-08-14 17:35:20.000000000 +0200
@@ -1 +1 @@
-c5e6c31f7592f600df3c9517e1bd51086cac84b7
+21ec9ff84cba24ea6e53a268da21a72e6ab190d0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/refs/heads/ofed_1_2 new/ofa_kernel-1.2.5/.git/refs/heads/ofed_1_2
--- old/ofa_kernel-1.2.c/.git/refs/heads/ofed_1_2 2007-08-07 16:11:47.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/refs/heads/ofed_1_2 2007-08-14 17:35:07.000000000 +0200
@@ -1 +1 @@
-948b7f77dfbf8e12c62772e7e706dae533716f05
+71a6a9d52af72b198257e609026bfd0090cbd842
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/refs/heads/ofed_1_2_c new/ofa_kernel-1.2.5/.git/refs/heads/ofed_1_2_c
--- old/ofa_kernel-1.2.c/.git/refs/heads/ofed_1_2_c 2007-08-07 16:11:47.000000000 +0200
+++ new/ofa_kernel-1.2.5/.git/refs/heads/ofed_1_2_c 2007-08-14 17:35:07.000000000 +0200
@@ -1 +1 @@
-c5e6c31f7592f600df3c9517e1bd51086cac84b7
+21ec9ff84cba24ea6e53a268da21a72e6ab190d0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/refs/tags/vofed-1.2.c-10 new/ofa_kernel-1.2.5/.git/refs/tags/vofed-1.2.c-10
--- old/ofa_kernel-1.2.c/.git/refs/tags/vofed-1.2.c-10 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/.git/refs/tags/vofed-1.2.c-10 2007-08-14 17:35:08.000000000 +0200
@@ -0,0 +1 @@
+b97f58080569443f0783f470e2694d901fecf2d6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/.git/refs/tags/vofed-1.2.c-11 new/ofa_kernel-1.2.5/.git/refs/tags/vofed-1.2.c-11
--- old/ofa_kernel-1.2.c/.git/refs/tags/vofed-1.2.c-11 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/.git/refs/tags/vofed-1.2.c-11 2007-08-14 17:35:08.000000000 +0200
@@ -0,0 +1 @@
+8f53f8b5f63ebad28e22a412f62be9d7d2ae718b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.11/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.11/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.11/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.11/include/linux/etherdevice.h 2007-08-14 17:35:13.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.12/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.12/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.12/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.12/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.13/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.13/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.13/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.13/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.14/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.14/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.14/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.14/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.15/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.15/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.15/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.15/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h 2007-08-14 17:35:14.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10/include/linux/crypto.h 2007-08-14 17:35:15.000000000 +0200
@@ -21,7 +21,7 @@
struct scatterlist *sg,
unsigned int nbytes, u8 *out)
{
- crypto_digest_digest(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE, out);
+ crypto_digest_digest(desc->tfm, sg, 1, out);
return nbytes;
}
@@ -29,7 +29,7 @@
struct scatterlist *sg,
unsigned int nbytes)
{
- crypto_digest_update(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE);
+ crypto_digest_update(desc->tfm, sg, 1);
return nbytes;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/crypto.h 2007-08-14 17:35:15.000000000 +0200
@@ -21,7 +21,7 @@
struct scatterlist *sg,
unsigned int nbytes, u8 *out)
{
- crypto_digest_digest(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE, out);
+ crypto_digest_digest(desc->tfm, sg, 1, out);
return nbytes;
}
@@ -29,7 +29,7 @@
struct scatterlist *sg,
unsigned int nbytes)
{
- crypto_digest_update(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE);
+ crypto_digest_update(desc->tfm, sg, 1);
return nbytes;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.17/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.17/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.17/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.17/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18_FC6/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18_FC6/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18_FC6/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18_FC6/include/linux/crypto.h 2007-08-14 17:35:15.000000000 +0200
@@ -21,7 +21,7 @@
struct scatterlist *sg,
unsigned int nbytes, u8 *out)
{
- crypto_digest_digest(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE, out);
+ crypto_digest_digest(desc->tfm, sg, 1, out);
return nbytes;
}
@@ -29,7 +29,7 @@
struct scatterlist *sg,
unsigned int nbytes)
{
- crypto_digest_update(desc->tfm, sg, (nbytes+(PAGE_SIZE-1)) / PAGE_SIZE);
+ crypto_digest_update(desc->tfm, sg, 1);
return nbytes;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.19/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.19/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.19/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.19/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.20/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.20/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.20/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.20/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.21/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.21/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.21/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.21/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h 2007-08-14 17:35:15.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/slab.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/slab.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/slab.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/slab.h 2007-08-14 17:35:15.000000000 +0200
@@ -29,6 +29,8 @@
return kmalloc(size, flags);
}
+#define kmem_cache kmem_cache_s
+
#endif
#ifndef SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
#define SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h 2007-08-14 17:35:17.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U2/include/linux/slab.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U2/include/linux/slab.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U2/include/linux/slab.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U2/include/linux/slab.h 2007-08-14 17:35:17.000000000 +0200
@@ -39,6 +39,8 @@
return kmalloc(size, flags);
}
+#define kmem_cache kmem_cache_s
+
#endif
#ifndef SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
#define SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/crypto.h 2007-08-14 17:35:17.000000000 +0200
@@ -1,11 +1,54 @@
-#ifndef LINUX_CRYPTO_BACKPORT_H
-#define LINUX_CRYPTO_BACKPORT_H
+#ifndef BACKPORT_LINUX_CRYPTO_H
+#define BACKPORT_LINUX_CRYPTO_H
#include_next
-#define crypto_hash_init(desc) crypto_digest_init(*desc)
-#define crypto_hash_digest(desc, sg, nbytes, out) crypto_digest_digest(*desc, sg, 1, out)
-#define crypto_hash_update(desc, sg, nbytes) crypto_digest_update(*desc, sg, 1)
-#define crypto_hash_final(desc, out) crypto_digest_final(*desc, out)
+#define CRYPTO_ALG_ASYNC 0x00000080
+
+struct hash_desc
+{
+ struct crypto_tfm *tfm;
+ u32 flags;
+};
+
+static inline int crypto_hash_init(struct hash_desc *desc)
+{
+ crypto_digest_init(desc->tfm);
+ return 0;
+}
+
+static inline int crypto_hash_digest(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes, u8 *out)
+{
+ crypto_digest_digest(desc->tfm, sg, 1, out);
+ return nbytes;
+}
+
+static inline int crypto_hash_update(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes)
+{
+ crypto_digest_update(desc->tfm, sg, 1);
+ return nbytes;
+}
+
+static inline int crypto_hash_final(struct hash_desc *desc, u8 *out)
+{
+ crypto_digest_final(desc->tfm, out);
+ return 0;
+}
+
+static inline struct crypto_tfm *crypto_alloc_hash(const char *alg_name,
+ u32 type, u32 mask)
+{
+ struct crypto_tfm *ret = crypto_alloc_tfm(alg_name ,type);
+ return ret ? ret : ERR_PTR(-ENOMEM);
+}
+
+static inline void crypto_free_hash(struct crypto_tfm *tfm)
+{
+ crypto_free_tfm(tfm);
+}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h 2007-08-14 17:35:17.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/slab.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/slab.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U3/include/linux/slab.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U3/include/linux/slab.h 2007-08-14 17:35:17.000000000 +0200
@@ -20,6 +20,8 @@
return kmalloc(size, flags);
}
+#define kmem_cache kmem_cache_s
+
#endif
#ifndef SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
#define SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/crypto.h 2007-08-14 17:35:17.000000000 +0200
@@ -1,11 +1,54 @@
-#ifndef LINUX_CRYPTO_BACKPORT_H
-#define LINUX_CRYPTO_BACKPORT_H
+#ifndef BACKPORT_LINUX_CRYPTO_H
+#define BACKPORT_LINUX_CRYPTO_H
#include_next
-#define crypto_hash_init(desc) crypto_digest_init(*desc)
-#define crypto_hash_digest(desc, sg, nbytes, out) crypto_digest_digest(*desc, sg, 1, out)
-#define crypto_hash_update(desc, sg, nbytes) crypto_digest_update(*desc, sg, 1)
-#define crypto_hash_final(desc, out) crypto_digest_final(*desc, out)
+#define CRYPTO_ALG_ASYNC 0x00000080
+
+struct hash_desc
+{
+ struct crypto_tfm *tfm;
+ u32 flags;
+};
+
+static inline int crypto_hash_init(struct hash_desc *desc)
+{
+ crypto_digest_init(desc->tfm);
+ return 0;
+}
+
+static inline int crypto_hash_digest(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes, u8 *out)
+{
+ crypto_digest_digest(desc->tfm, sg, 1, out);
+ return nbytes;
+}
+
+static inline int crypto_hash_update(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes)
+{
+ crypto_digest_update(desc->tfm, sg, 1);
+ return nbytes;
+}
+
+static inline int crypto_hash_final(struct hash_desc *desc, u8 *out)
+{
+ crypto_digest_final(desc->tfm, out);
+ return 0;
+}
+
+static inline struct crypto_tfm *crypto_alloc_hash(const char *alg_name,
+ u32 type, u32 mask)
+{
+ struct crypto_tfm *ret = crypto_alloc_tfm(alg_name ,type);
+ return ret ? ret : ERR_PTR(-ENOMEM);
+}
+
+static inline void crypto_free_hash(struct crypto_tfm *tfm)
+{
+ crypto_free_tfm(tfm);
+}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h 2007-08-14 17:35:17.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/slab.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/slab.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U4/include/linux/slab.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U4/include/linux/slab.h 2007-08-14 17:35:17.000000000 +0200
@@ -20,6 +20,8 @@
return kmalloc(size, flags);
}
+#define kmem_cache kmem_cache_s
+
#endif
#ifndef SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
#define SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/crypto.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/crypto.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/crypto.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/crypto.h 2007-08-14 17:35:17.000000000 +0200
@@ -1,11 +1,54 @@
-#ifndef LINUX_CRYPTO_BACKPORT_H
-#define LINUX_CRYPTO_BACKPORT_H
+#ifndef BACKPORT_LINUX_CRYPTO_H
+#define BACKPORT_LINUX_CRYPTO_H
#include_next
-#define crypto_hash_init(desc) crypto_digest_init(*desc)
-#define crypto_hash_digest(desc, sg, nbytes, out) crypto_digest_digest(*desc, sg, 1, out)
-#define crypto_hash_update(desc, sg, nbytes) crypto_digest_update(*desc, sg, 1)
-#define crypto_hash_final(desc, out) crypto_digest_final(*desc, out)
+#define CRYPTO_ALG_ASYNC 0x00000080
+
+struct hash_desc
+{
+ struct crypto_tfm *tfm;
+ u32 flags;
+};
+
+static inline int crypto_hash_init(struct hash_desc *desc)
+{
+ crypto_digest_init(desc->tfm);
+ return 0;
+}
+
+static inline int crypto_hash_digest(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes, u8 *out)
+{
+ crypto_digest_digest(desc->tfm, sg, 1, out);
+ return nbytes;
+}
+
+static inline int crypto_hash_update(struct hash_desc *desc,
+ struct scatterlist *sg,
+ unsigned int nbytes)
+{
+ crypto_digest_update(desc->tfm, sg, 1);
+ return nbytes;
+}
+
+static inline int crypto_hash_final(struct hash_desc *desc, u8 *out)
+{
+ crypto_digest_final(desc->tfm, out);
+ return 0;
+}
+
+static inline struct crypto_tfm *crypto_alloc_hash(const char *alg_name,
+ u32 type, u32 mask)
+{
+ struct crypto_tfm *ret = crypto_alloc_tfm(alg_name ,type);
+ return ret ? ret : ERR_PTR(-ENOMEM);
+}
+
+static inline void crypto_free_hash(struct crypto_tfm *tfm)
+{
+ crypto_free_tfm(tfm);
+}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h 2007-08-14 17:35:17.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next
+
+static inline unsigned short backport_eth_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ skb->dev = dev;
+ return eth_type_trans(skb, dev);
+}
+
+#define eth_type_trans backport_eth_type_trans
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/slab.h new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/slab.h
--- old/ofa_kernel-1.2.c/kernel_addons/backport/2.6.9_U5/include/linux/slab.h 2007-08-07 16:11:51.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_addons/backport/2.6.9_U5/include/linux/slab.h 2007-08-14 17:35:17.000000000 +0200
@@ -20,6 +20,8 @@
return kmalloc(size, flags);
}
+#define kmem_cache kmem_cache_s
+
#endif
#ifndef SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
#define SLAB_H_KMEMCACHE_ZALLOC_BACKPORT_TO_2_6_16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U3/add_open_iscsi.patch new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U3/add_open_iscsi.patch
--- old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U3/add_open_iscsi.patch 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U3/add_open_iscsi.patch 2007-08-14 17:35:18.000000000 +0200
@@ -2,77 +2,6 @@
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.c 2007-06-10 06:56:12.000000000 -0700
+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.c 2007-06-10 07:01:47.000000000 -0700
-@@ -676,7 +676,7 @@ iscsi_tcp_copy(struct iscsi_conn *conn,
- }
-
- static inline void
--partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg,
-+partial_sg_digest_update(struct crypto_tfm *desc, struct scatterlist *sg,
- int offset, int length)
- {
- struct scatterlist temp;
-@@ -684,7 +684,7 @@ partial_sg_digest_update(struct hash_des
- memcpy(&temp, sg, sizeof(struct scatterlist));
- temp.offset = offset;
- temp.length = length;
-- crypto_hash_update(desc, &temp, length);
-+ crypto_hash_update(&desc, &temp, length);
- }
-
- static void
-@@ -1774,32 +1774,18 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
- /* initial operational parameters */
- tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
-
-- tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->tx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->tx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->tx_hash.tfm));
-+ tcp_conn->tx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->tx_hash)
- goto free_tcp_conn;
-- }
-
-- tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->rx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->rx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->rx_hash.tfm));
-+ tcp_conn->rx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->rx_hash)
- goto free_tx_tfm;
-- }
-
- return cls_conn;
-
- free_tx_tfm:
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-+ crypto_free_tfm(tcp_conn->tx_hash);
- free_tcp_conn:
- kfree(tcp_conn);
- tcp_conn_alloc_fail:
-@@ -1833,10 +1819,10 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
- iscsi_tcp_release_conn(conn);
- iscsi_conn_teardown(cls_conn);
-
-- if (tcp_conn->tx_hash.tfm)
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-- if (tcp_conn->rx_hash.tfm)
-- crypto_free_hash(tcp_conn->rx_hash.tfm);
-+ if (tcp_conn->tx_hash)
-+ crypto_free_tfm(tcp_conn->tx_hash);
-+ if (tcp_conn->rx_hash)
-+ crypto_free_tfm(tcp_conn->rx_hash);
-
- kfree(tcp_conn);
- }
@@ -2027,7 +2013,7 @@ iscsi_tcp_conn_get_param(struct iscsi_cl
{
struct iscsi_conn *conn = cls_conn->dd_data;
@@ -90,29 +19,6 @@
.can_queue = ISCSI_XMIT_CMDS_MAX - 1,
.sg_tablesize = ISCSI_SG_TABLESIZE,
.max_sectors = 0xFFFF,
-Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h
-===================================================================
---- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.h 2007-06-10 06:56:12.000000000 -0700
-+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h 2007-06-10 06:57:25.000000000 -0700
-@@ -49,7 +49,6 @@
- #define ISCSI_SG_TABLESIZE SG_ALL
- #define ISCSI_TCP_MAX_CMD_LEN 16
-
--struct crypto_hash;
- struct socket;
-
- /* Socket connection recieve helper */
-@@ -93,8 +92,8 @@ struct iscsi_tcp_conn {
- void (*old_write_space)(struct sock *);
-
- /* data and header digests */
-- struct hash_desc tx_hash; /* CRC32C (Tx) */
-- struct hash_desc rx_hash; /* CRC32C (Rx) */
-+ struct crypto_tfm *tx_hash; /* CRC32C (Tx) */
-+ struct crypto_tfm *rx_hash; /* CRC32C (Rx) */
-
- /* MIB custom statistics */
- uint32_t sendpage_failures_cnt;
Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/libiscsi.c
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/libiscsi.c 2007-06-10 06:56:12.000000000 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U4/add_open_iscsi.patch new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U4/add_open_iscsi.patch
--- old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U4/add_open_iscsi.patch 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U4/add_open_iscsi.patch 2007-08-14 17:35:18.000000000 +0200
@@ -2,77 +2,6 @@
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.c 2007-06-10 06:56:12.000000000 -0700
+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.c 2007-06-10 07:01:47.000000000 -0700
-@@ -676,7 +676,7 @@ iscsi_tcp_copy(struct iscsi_conn *conn,
- }
-
- static inline void
--partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg,
-+partial_sg_digest_update(struct crypto_tfm *desc, struct scatterlist *sg,
- int offset, int length)
- {
- struct scatterlist temp;
-@@ -684,7 +684,7 @@ partial_sg_digest_update(struct hash_des
- memcpy(&temp, sg, sizeof(struct scatterlist));
- temp.offset = offset;
- temp.length = length;
-- crypto_hash_update(desc, &temp, length);
-+ crypto_hash_update(&desc, &temp, length);
- }
-
- static void
-@@ -1774,32 +1774,18 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
- /* initial operational parameters */
- tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
-
-- tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->tx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->tx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->tx_hash.tfm));
-+ tcp_conn->tx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->tx_hash)
- goto free_tcp_conn;
-- }
-
-- tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->rx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->rx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->rx_hash.tfm));
-+ tcp_conn->rx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->rx_hash)
- goto free_tx_tfm;
-- }
-
- return cls_conn;
-
- free_tx_tfm:
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-+ crypto_free_tfm(tcp_conn->tx_hash);
- free_tcp_conn:
- kfree(tcp_conn);
- tcp_conn_alloc_fail:
-@@ -1833,10 +1819,10 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
- iscsi_tcp_release_conn(conn);
- iscsi_conn_teardown(cls_conn);
-
-- if (tcp_conn->tx_hash.tfm)
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-- if (tcp_conn->rx_hash.tfm)
-- crypto_free_hash(tcp_conn->rx_hash.tfm);
-+ if (tcp_conn->tx_hash)
-+ crypto_free_tfm(tcp_conn->tx_hash);
-+ if (tcp_conn->rx_hash)
-+ crypto_free_tfm(tcp_conn->rx_hash);
-
- kfree(tcp_conn);
- }
@@ -2027,7 +2013,7 @@ iscsi_tcp_conn_get_param(struct iscsi_cl
{
struct iscsi_conn *conn = cls_conn->dd_data;
@@ -90,29 +19,6 @@
.can_queue = ISCSI_XMIT_CMDS_MAX - 1,
.sg_tablesize = ISCSI_SG_TABLESIZE,
.max_sectors = 0xFFFF,
-Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h
-===================================================================
---- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.h 2007-06-10 06:56:12.000000000 -0700
-+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h 2007-06-10 06:57:25.000000000 -0700
-@@ -49,7 +49,6 @@
- #define ISCSI_SG_TABLESIZE SG_ALL
- #define ISCSI_TCP_MAX_CMD_LEN 16
-
--struct crypto_hash;
- struct socket;
-
- /* Socket connection recieve helper */
-@@ -93,8 +92,8 @@ struct iscsi_tcp_conn {
- void (*old_write_space)(struct sock *);
-
- /* data and header digests */
-- struct hash_desc tx_hash; /* CRC32C (Tx) */
-- struct hash_desc rx_hash; /* CRC32C (Rx) */
-+ struct crypto_tfm *tx_hash; /* CRC32C (Tx) */
-+ struct crypto_tfm *rx_hash; /* CRC32C (Rx) */
-
- /* MIB custom statistics */
- uint32_t sendpage_failures_cnt;
Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/libiscsi.c
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/libiscsi.c 2007-06-10 06:56:12.000000000 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U5/add_open_iscsi.patch new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U5/add_open_iscsi.patch
--- old/ofa_kernel-1.2.c/kernel_patches/backport/2.6.9_U5/add_open_iscsi.patch 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/kernel_patches/backport/2.6.9_U5/add_open_iscsi.patch 2007-08-14 17:35:18.000000000 +0200
@@ -2,77 +2,6 @@
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.c 2007-06-10 06:56:12.000000000 -0700
+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.c 2007-06-10 07:01:47.000000000 -0700
-@@ -676,7 +676,7 @@ iscsi_tcp_copy(struct iscsi_conn *conn,
- }
-
- static inline void
--partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg,
-+partial_sg_digest_update(struct crypto_tfm *desc, struct scatterlist *sg,
- int offset, int length)
- {
- struct scatterlist temp;
-@@ -684,7 +684,7 @@ partial_sg_digest_update(struct hash_des
- memcpy(&temp, sg, sizeof(struct scatterlist));
- temp.offset = offset;
- temp.length = length;
-- crypto_hash_update(desc, &temp, length);
-+ crypto_hash_update(&desc, &temp, length);
- }
-
- static void
-@@ -1774,32 +1774,18 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
- /* initial operational parameters */
- tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
-
-- tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->tx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->tx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->tx_hash.tfm));
-+ tcp_conn->tx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->tx_hash)
- goto free_tcp_conn;
-- }
-
-- tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
-- CRYPTO_ALG_ASYNC);
-- tcp_conn->rx_hash.flags = 0;
-- if (IS_ERR(tcp_conn->rx_hash.tfm)) {
-- printk(KERN_ERR "Could not create connection due to crc32c "
-- "loading error %ld. Make sure the crc32c module is "
-- "built as a module or into the kernel\n",
-- PTR_ERR(tcp_conn->rx_hash.tfm));
-+ tcp_conn->rx_hash = crypto_alloc_tfm("crc32c", 0);
-+ if (!tcp_conn->rx_hash)
- goto free_tx_tfm;
-- }
-
- return cls_conn;
-
- free_tx_tfm:
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-+ crypto_free_tfm(tcp_conn->tx_hash);
- free_tcp_conn:
- kfree(tcp_conn);
- tcp_conn_alloc_fail:
-@@ -1833,10 +1819,10 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
- iscsi_tcp_release_conn(conn);
- iscsi_conn_teardown(cls_conn);
-
-- if (tcp_conn->tx_hash.tfm)
-- crypto_free_hash(tcp_conn->tx_hash.tfm);
-- if (tcp_conn->rx_hash.tfm)
-- crypto_free_hash(tcp_conn->rx_hash.tfm);
-+ if (tcp_conn->tx_hash)
-+ crypto_free_tfm(tcp_conn->tx_hash);
-+ if (tcp_conn->rx_hash)
-+ crypto_free_tfm(tcp_conn->rx_hash);
-
- kfree(tcp_conn);
- }
@@ -2027,7 +2013,7 @@ iscsi_tcp_conn_get_param(struct iscsi_cl
{
struct iscsi_conn *conn = cls_conn->dd_data;
@@ -90,29 +19,6 @@
.can_queue = ISCSI_XMIT_CMDS_MAX - 1,
.sg_tablesize = ISCSI_SG_TABLESIZE,
.max_sectors = 0xFFFF,
-Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h
-===================================================================
---- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/iscsi_tcp.h 2007-06-10 06:56:12.000000000 -0700
-+++ ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/iscsi_tcp.h 2007-06-10 06:57:25.000000000 -0700
-@@ -49,7 +49,6 @@
- #define ISCSI_SG_TABLESIZE SG_ALL
- #define ISCSI_TCP_MAX_CMD_LEN 16
-
--struct crypto_hash;
- struct socket;
-
- /* Socket connection recieve helper */
-@@ -93,8 +92,8 @@ struct iscsi_tcp_conn {
- void (*old_write_space)(struct sock *);
-
- /* data and header digests */
-- struct hash_desc tx_hash; /* CRC32C (Tx) */
-- struct hash_desc rx_hash; /* CRC32C (Rx) */
-+ struct crypto_tfm *tx_hash; /* CRC32C (Tx) */
-+ struct crypto_tfm *rx_hash; /* CRC32C (Rx) */
-
- /* MIB custom statistics */
- uint32_t sendpage_failures_cnt;
Index: ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check/drivers/scsi/libiscsi.c
===================================================================
--- ofa_1_2_kernel-20070610-0656_linux-2.6.9-42.ELsmp_x86_64_check.orig/drivers/scsi/libiscsi.c 2007-06-10 06:56:12.000000000 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/0028-cxgb3-fw-4.6.0 new/ofa_kernel-1.2.5/kernel_patches/fixes/0028-cxgb3-fw-4.6.0
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/0028-cxgb3-fw-4.6.0 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/0028-cxgb3-fw-4.6.0 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,45 @@
+cxgb3: update firmware version to 4.6.0.
+
+From: Steve Wise
+
+This firmware fixes a handful of RDMA bugs.
+
+Signed-off-by: Steve Wise
+---
+
+ drivers/net/cxgb3/common.h | 4 ++--
+ drivers/net/cxgb3/version.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
+index f77c919..0ff9cb5 100644
+--- a/drivers/net/cxgb3/common.h
++++ b/drivers/net/cxgb3/common.h
+@@ -126,8 +126,8 @@ enum { /* adapter interrupt-maintaine
+
+ enum {
+ TP_VERSION_MAJOR = 1,
+- TP_VERSION_MINOR = 0,
+- TP_VERSION_MICRO = 44
++ TP_VERSION_MINOR = 1,
++ TP_VERSION_MICRO = 0
+ };
+
+ #define S_TP_VERSION_MAJOR 16
+diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
+index eb508bf..ef2405a 100644
+--- a/drivers/net/cxgb3/version.h
++++ b/drivers/net/cxgb3/version.h
+@@ -35,10 +35,10 @@ #define __CHELSIO_VERSION_H
+ #define DRV_DESC "Chelsio T3 Network Driver"
+ #define DRV_NAME "cxgb3"
+ /* Driver version */
+-#define DRV_VERSION "1.0-ko"
++#define DRV_VERSION "1.0-ofed"
+
+ /* Firmware version */
+ #define FW_VERSION_MAJOR 4
+-#define FW_VERSION_MINOR 3
++#define FW_VERSION_MINOR 6
+ #define FW_VERSION_MICRO 0
+ #endif /* __CHELSIO_VERSION_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/ehca_add_mutex_h.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/ehca_add_mutex_h.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/ehca_add_mutex_h.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/ehca_add_mutex_h.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,21 @@
+include linux/mutex.h from ehca_classes.h
+
+ehca_classes.h uses struct mutex, so while
+linux/mutex.h seems to be pulled in indirectly
+by one of the headers it includes, the right thing
+is to include linux/mutex.h directly.
+
+Signed-off-by: Michael S. Tsirkin
+
+diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
+index 1d286d3..e63711f 100644
+--- a/drivers/infiniband/hw/ehca/ehca_classes.h
++++ b/drivers/infiniband/hw/ehca/ehca_classes.h
+@@ -53,6 +53,7 @@ struct ehca_pd;
+ struct ehca_av;
+
+ #include
++#include
+
+ #include
+ #include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/ib_find_pkey.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/ib_find_pkey.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/ib_find_pkey.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/ib_find_pkey.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,29 @@
+ib_find_pkey() is used as a replacement for ib_find_cached_pkey(), and
+the original function ignored the membership bit when searching for a
+P_Key, so ib_find_pkey() should ignore the bit too.
+
+In particular, IPoIB turns on the P_Key membership bit of limited
+membership P_Keys when creating a child interface and looks for the
+full membership P_key. This broke if a port was a partial member of a
+partition when IPoIB switched from ib_find_cached_pkey() to
+ib_find_pkey(), and this change fixes things again.
+
+Signed-off-by: Moni Shoua
+Signed-off-by: Roland Dreier
+---
+
+diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
+index 3ada17c..2506c43 100644
+--- a/drivers/infiniband/core/device.c
++++ b/drivers/infiniband/core/device.c
+@@ -702,7 +702,7 @@ int ib_find_pkey(struct ib_device *device,
+ if (ret)
+ return ret;
+
+- if (pkey == tmp_pkey) {
++ if ((pkey & 0x7fff) == (tmp_pkey & 0x7fff)) {
+ *index = i;
+ return 0;
+ }
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/mlx4_reset_msleep.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/mlx4_reset_msleep.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/mlx4_reset_msleep.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/mlx4_reset_msleep.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,17 @@
+Put a 500 msec delay after resetting the device before attempting to do config
+cycles on it. This is required to avoid system hang in some chipsets.
+
+Signed-off-by: Eli Cohen
+---
+diff --git a/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c
+index e4dfd4b..23189bc 100644
+--- a/drivers/net/mlx4/reset.c
++++ b/drivers/net/mlx4/reset.c
+@@ -119,6 +119,7 @@ int mlx4_reset(struct mlx4_dev *dev)
+ writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
+ iounmap(reset);
+
++ msleep(500);
+ end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
+ do {
+ if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_core_1_umem_ret_initialize.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_core_1_umem_ret_initialize.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_core_1_umem_ret_initialize.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_core_1_umem_ret_initialize.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,28 @@
+commit 1d3f4b905a786d69103d9e6d8e92683fb2c7a027
+Author: Andrew Morton
+Date: Fri Jun 8 16:29:43 2007 -0700
+
+ IB: Fix ib_umem_get() when npages == 0
+
+ gcc correctly warned:
+
+ drivers/infiniband/core/umem.c: In function 'ib_umem_get':
+ drivers/infiniband/core/umem.c:78: warning: 'ret' may be used uninitialized in this function
+
+ Set ret to 0 in case npages == 0 and the loop isn't entered at all.
+
+ Signed-off-by: Andrew Morton
+ Signed-off-by: Roland Dreier
+
+diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
+index d40652a..26d0470 100644
+--- a/drivers/infiniband/core/umem.c
++++ b/drivers/infiniband/core/umem.c
+@@ -121,6 +121,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
+
+ cur_base = addr & PAGE_MASK;
+
++ ret = 0;
+ while (npages) {
+ ret = get_user_pages(current, current->mm, cur_base,
+ min_t(int, npages,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_1_qp_create_err_handling.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_1_qp_create_err_handling.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_1_qp_create_err_handling.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_1_qp_create_err_handling.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,35 @@
+commit 23f1b38481596ad77e5f51562977b12c8418eee3
+Author: Roland Dreier
+Date: Fri Jul 20 21:19:43 2007 -0700
+
+ IB/mlx4: Fix error path in create_qp_common()
+
+ The error handling code at err_wrid in create_qp_common() does not
+ handle a userspace QP attached to an SRQ correctly, since it ends up
+ in the else clause of the if statement. This means it tries to
+ kfree() the uninitialized qp->sq.wrid and qp->rq.wrid pointers. Fix
+ this so we only free the wrid arrays for kernel QPs.
+
+ Pointed out by Michael S. Tsirkin .
+
+ Signed-off-by: Roland Dreier
+
+diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
+index 5456bc4..f6315df 100644
+--- a/drivers/infiniband/hw/mlx4/qp.c
++++ b/drivers/infiniband/hw/mlx4/qp.c
+@@ -415,9 +415,11 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
+ return 0;
+
+ err_wrid:
+- if (pd->uobject && !init_attr->srq)
+- mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);
+- else {
++ if (pd->uobject) {
++ if (!init_attr->srq)
++ mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context),
++ &qp->db);
++ } else {
+ kfree(qp->sq.wrid);
+ kfree(qp->rq.wrid);
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_2_leaks_fix.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_2_leaks_fix.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_2_leaks_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_2_leaks_fix.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,59 @@
+commit f5b404317b79823ec643dfbb71d62f65a48cc178
+Author: Florin Malita
+Date: Thu Jul 19 15:58:09 2007 -0400
+
+ IB/mlx4: Fix leaks in __mlx4_ib_modify_qp
+
+ Temporarily allocated struct mlx4_qp_context *context is leaked by
+ several error paths. The patch takes advantage of the return value
+ 'err' being preinitialized to -EINVAL.
+
+ Spotted by Coverity (CID 1768).
+
+ Signed-off-by: Florin Malita
+ Signed-off-by: Roland Dreier
+
+diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
+index b5a24fb..5456bc4 100644
+--- a/drivers/infiniband/hw/mlx4/qp.c
++++ b/drivers/infiniband/hw/mlx4/qp.c
+@@ -742,7 +742,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
+ if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_4096) {
+ printk(KERN_ERR "path MTU (%u) is invalid\n",
+ attr->path_mtu);
+- return -EINVAL;
++ goto out;
+ }
+ context->mtu_msgmax = (attr->path_mtu << 5) | 31;
+ }
+@@ -781,10 +781,8 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
+
+ if (attr_mask & IB_QP_AV) {
+ if (mlx4_set_path(dev, &attr->ah_attr, &context->pri_path,
+- attr_mask & IB_QP_PORT ? attr->port_num : qp->port)) {
+- err = -EINVAL;
++ attr_mask & IB_QP_PORT ? attr->port_num : qp->port))
+ goto out;
+- }
+
+ optpar |= (MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH |
+ MLX4_QP_OPTPAR_SCHED_QUEUE);
+@@ -798,15 +796,15 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
+ if (attr_mask & IB_QP_ALT_PATH) {
+ if (attr->alt_port_num == 0 ||
+ attr->alt_port_num > dev->dev->caps.num_ports)
+- return -EINVAL;
++ goto out;
+
+ if (attr->alt_pkey_index >=
+ dev->dev->caps.pkey_table_len[attr->alt_port_num])
+- return -EINVAL;
++ goto out;
+
+ if (mlx4_set_path(dev, &attr->alt_ah_attr, &context->alt_path,
+ attr->alt_port_num))
+- return -EINVAL;
++ goto out;
+
+ context->alt_path.pkey_index = attr->alt_pkey_index;
+ context->alt_path.ackto = attr->alt_timeout << 3;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_3_cmd_timeout.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_3_cmd_timeout.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mlx4_3_cmd_timeout.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mlx4_3_cmd_timeout.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,39 @@
+commit 0981582dbfae86ba0306406f1af329bb702752d2
+Author: Roland Dreier
+Date: Fri Jul 20 21:19:43 2007 -0700
+
+ mlx4_core: Change command token on timeout
+
+ The FW command token is currently only updated on a command completion
+ event. This means that on command timeout, the same token will be
+ reused for new command, which results in a mess if the timed out
+ command *does* eventually complete.
+
+ This is the same change as the patch for mthca from Michael
+ S. Tsirkin that was just merged. It seems
+ sensible to avoid gratuitous differences in FW command processing
+ between mthca and mlx4.
+
+ Signed-off-by: Roland Dreier
+
+diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c
+index c1f81a9..a9f3175 100644
+--- a/drivers/net/mlx4/cmd.c
++++ b/drivers/net/mlx4/cmd.c
+@@ -246,8 +246,6 @@ void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param)
+ context->result = mlx4_status_to_errno(status);
+ context->out_param = out_param;
+
+- context->token += priv->cmd.token_mask + 1;
+-
+ complete(&context->done);
+ }
+
+@@ -264,6 +262,7 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
+ spin_lock(&cmd->context_lock);
+ BUG_ON(cmd->free_head < 0);
+ context = &cmd->context[cmd->free_head];
++ context->token += cmd->token_mask + 1;
+ cmd->free_head = context->next;
+ spin_unlock(&cmd->context_lock);
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mthca_1_fw_revision_printk.patch new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mthca_1_fw_revision_printk.patch
--- old/ofa_kernel-1.2.c/kernel_patches/fixes/zap_IB_mthca_1_fw_revision_printk.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/ofa_kernel-1.2.5/kernel_patches/fixes/zap_IB_mthca_1_fw_revision_printk.patch 2007-08-14 17:35:19.000000000 +0200
@@ -0,0 +1,29 @@
+commit e4daf738683d9e87caf12f4249268d3c9ed2e00f
+Author: Roland Dreier
+Date: Tue Jul 17 18:37:42 2007 -0700
+
+ IB/mthca: Fix printk format used for firmware version in warning
+
+ When warning about out-of-date firmware, current mthca code messes up
+ the formatting of the version if the subminor doesn't have three
+ digits. It doesn't fill the field with 0s so we end up with:
+
+ ib_mthca 0000:0b:00.0: HCA FW version 1.1. 0 is old (1.2. 0 is current).
+
+ Change the format from "%3d" to "%03d" to get the right thing printed.
+
+ Signed-off-by: Roland Dreier
+
+diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
+index 7ea6713..76fed75 100644
+--- a/drivers/infiniband/hw/mthca/mthca_main.c
++++ b/drivers/infiniband/hw/mthca/mthca_main.c
+@@ -1147,7 +1147,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
+ goto err_cmd;
+
+ if (mdev->fw_ver < mthca_hca_table[hca_type].latest_fw) {
+- mthca_warn(mdev, "HCA FW version %d.%d.%3d is old (%d.%d.%3d is current).\n",
++ mthca_warn(mdev, "HCA FW version %d.%d.%03d is old (%d.%d.%03d is current).\n",
+ (int) (mdev->fw_ver >> 32), (int) (mdev->fw_ver >> 16) & 0xffff,
+ (int) (mdev->fw_ver & 0xffff),
+ (int) (mthca_hca_table[hca_type].latest_fw >> 32),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ofa_kernel-1.2.c/ofed_scripts/openibd new/ofa_kernel-1.2.5/ofed_scripts/openibd
--- old/ofa_kernel-1.2.c/ofed_scripts/openibd 2007-08-07 16:11:52.000000000 +0200
+++ new/ofa_kernel-1.2.5/ofed_scripts/openibd 2007-08-14 17:35:20.000000000 +0200
@@ -275,7 +275,7 @@
UNLOAD_MODULES="$UNLOAD_MODULES rdma_ucm rdma_cm ib_addr ib_cm ib_local_sa findex"
UNLOAD_MODULES="$UNLOAD_MODULES ib_sa ib_uverbs ib_umad ib_mad ib_core"
-STATUS_MODULES="rdma_ucm ib_rds rds ib_srp ib_vnic ib_sdp rdma_cm ib_addr ib_local_sa findex ib_ipoib ib_ehca ib_ipath ipath_core ib_mthca ib_uverbs ib_umad ib_ucm ib_sa ib_cm ib_mad ib_core"
+STATUS_MODULES="rdma_ucm ib_rds rds ib_srp ib_vnic ib_sdp rdma_cm ib_addr ib_local_sa findex ib_ipoib ib_ehca ib_ipath ipath_core mlx4_core mlx4_ib ib_mthca ib_uverbs ib_umad ib_ucm ib_sa ib_cm ib_mad ib_core"
ipoib_ha_pidfile=/var/run/ipoib_ha.pid
srp_daemon_pidfile=/var/run/srp_daemon.pid
@@ -1175,7 +1175,7 @@
{
local RC=0
- if is_module ib_mthca || is_module ib_ipath || is_module ib_ehca; then
+ if is_module ib_mthca || is_module mlx4_core || is_module ib_ipath || is_module ib_ehca; then
echo
echo " HCA driver loaded"
echo
++++++ ofed-docs-1.2.tar.bz2 -> ofed-docs-1.2.5.tar.bz2 ++++++
++++ 7030 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org