[ofa-general] [ GIT PULL ] ofed-1.2 - Chelsio Driver Fixes

Steve Wise swise at opengridcomputing.com
Fri Aug 10 12:50:07 PDT 2007


Vlad,

Please pull the changes to fix ofed bugs 702 and 705 (705 is 1.2.c
only).

git://git.openfabrics.org/~swise/ofed_1_2 ofed_1_2

and

git://git.openfabrics.org/~swise/ofed_1_2 ofed_1_2_c



Thanks,

Steve.



The ofed_1_2_c branch patches:

---------------------

commit 1baf63679a33bc19c7659acab049210bde44905d
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Fri Aug 10 08:19:40 2007 -0500

    cxgb3: update firmware version to 4.6.0.
    
    This firmware fixes a handful of RDMA bugs.
    
    - updated required firmware to 4.6.0
    - update required psram to 1.1.0
    - changed cxgb3.ko version to 1.0-ofed
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>

diff --git a/kernel_patches/fixes/0028-cxgb3-fw-4.6.0 b/kernel_patches/fixes/0028-cxgb3-fw-4.6.0
new file mode 100644
index 0000000..176ed4a
--- /dev/null
+++ b/kernel_patches/fixes/0028-cxgb3-fw-4.6.0
@@ -0,0 +1,45 @@
+cxgb3: update firmware version to 4.6.0.
+
+From: Steve Wise <swise at opengridcomputing.com>
+
+This firmware fixes a handful of RDMA bugs.
+
+Signed-off-by: Steve Wise <swise at opengridcomputing.com>
+---
+
+ 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 */

commit d5acf47ef330570eb7ac2d715678e84a52865f8b
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Fri Aug 10 08:19:35 2007 -0500

    Backport 2.6.22 eth_type_trans().
    
    As of 2.6.22, eth_type_trans() sets skb->dev.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>

diff --git a/kernel_addons/backport/2.6.11/include/linux/etherdevice.h b/kernel_addons/backport/2.6.11/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.11/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h b/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.11_FC4/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.12/include/linux/etherdevice.h b/kernel_addons/backport/2.6.12/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.12/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.13/include/linux/etherdevice.h b/kernel_addons/backport/2.6.13/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.13/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h b/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.13_suse10_0_u/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.14/include/linux/etherdevice.h b/kernel_addons/backport/2.6.14/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.14/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.15/include/linux/etherdevice.h b/kernel_addons/backport/2.6.15/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.15/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h b/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.15_ubuntu606/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.16/include/linux/etherdevice.h b/kernel_addons/backport/2.6.16/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.16/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h b/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.16_sles10/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h b/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.16_sles10_sp1/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.17/include/linux/etherdevice.h b/kernel_addons/backport/2.6.17/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.17/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.18/include/linux/etherdevice.h b/kernel_addons/backport/2.6.18/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.18/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h b/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.18_FC6/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.19/include/linux/etherdevice.h b/kernel_addons/backport/2.6.19/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.19/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.20/include/linux/etherdevice.h b/kernel_addons/backport/2.6.20/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.20/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.21/include/linux/etherdevice.h b/kernel_addons/backport/2.6.21/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.21/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h b/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.5_sles9_sp3/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h b/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.9_U2/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h b/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.9_U3/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h b/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.9_U4/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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 --git a/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h b/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h
new file mode 100644
index 0000000..cd709f0
--- /dev/null
+++ b/kernel_addons/backport/2.6.9_U5/include/linux/etherdevice.h
@@ -0,0 +1,15 @@
+#ifndef BACKPORT_LINUX_ETHERDEVICE
+#define BACKPORT_LINUX_ETHERDEVICE
+
+#include_next <linux/etherdevice.h>
+
+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





More information about the general mailing list