be2net: Add support for next generation of BladeEngine device
Subsystems (2)
PATCH 1/2 be2net: Add support for next generation of BladeEngine device
Add new PCI ids to support next generation of BladeEnigne device.
--- drivers/net/benet/be.h | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)
drivers/net/benet/be.h +13 -2
@@ -35,20 +35,31 @@#define DRV_VER "2.101.205"#define DRV_NAME "be2net"#define BE_NAME "ServerEngines BladeEngine2 10Gbps NIC" +#define BE3_NAME "ServerEngines BladeEngine3 10Gbps NIC"#define OC_NAME "Emulex OneConnect 10Gbps NIC" +#define OC_NAME1 "Emulex OneConnect 10Gbps NIC (be3)"#define DRV_DESC BE_NAME "Driver"#define BE_VENDOR_ID 0x19a2#define BE_DEVICE_ID1 0x211 +#define BE_DEVICE_ID1 0x221#define OC_DEVICE_ID1 0x700#define OC_DEVICE_ID2 0x701 +#define OC_DEVICE_ID2 0x710static inline char *nic_name (struct pci_dev *pdev) { -if (pdev->device ==OC_DEVICE_ID1 || pdev->device ==OC_DEVICE_ID2 ) +switch (pdev->device) { +case OC_DEVICE_ID1 : +case OC_DEVICE_ID2 :return OC_NAME ; -else +case OC_DEVICE_ID3 : +return OC_NAME1 ; +case BE_DEVICE_ID2 : +return BE3_NAME ; +default :return BE_NAME ; + } }/* Number of bytes of an RX frame that are copied to skb->data */
Signature · 1 line
1.6.0.4
From: Ajit Khaparde <[email protected]>
Date: Wed, 14 Oct 2009 17:54:09 +0530
Quoted 3 lines
Add new PCI ids to support next generation of BladeEnigne device.
Signed-off-by Ajit Khaparde <[email protected]>
Applied.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Wed, 14 Oct 2009 15:24:02 -0700 (PDT)
Quoted 8 lines
From: Ajit Khaparde <[email protected]>
Date: Wed, 14 Oct 2009 17:54:09 +0530Quoted 3 lines
Add new PCI ids to support next generation of BladeEnigne device.
Signed-off-by Ajit Khaparde <[email protected]>Applied.
I have to revert your changes, how did this even build for you?
In file included from drivers/net/benet/be_cmds.c:18:drivers/net/benet/be.h:45:1: warning: "BE_DEVICE_ID1" redefined drivers/net/benet/be.h:44:1: warning: this is the location of the previous definition drivers/net/benet/be.h:48:1: warning: "OC_DEVICE_ID2" redefined drivers/net/benet/be.h:47:1: warning: this is the location of the previous definition
Well, obviously, since in your patch:
#define BE_VENDOR_ID 0x19a2
#define BE_DEVICE_ID1 0x211
+#define BE_DEVICE_ID1 0x221
#define OC_DEVICE_ID1 0x700
#define OC_DEVICE_ID2 0x701
+#define OC_DEVICE_ID2 0x710
drivers/net/benet/be.h:56: error: 'OC_DEVICE_ID3' undeclared (first use in this function) drivers/net/benet/be.h:58: error: 'BE_DEVICE_ID2' undeclared (first use in this function)
The mistake is obvious, and you provably didn't even compile check these changes.
How can I possibly take your patches seriously when it is clear how incredibly careless you are being here?
Quoted 29 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 14 Oct 2009 15:24:02 -0700 (PDT)Quoted 8 lines
From: Ajit Khaparde <[email protected]>
Date: Wed, 14 Oct 2009 17:54:09 +0530Quoted 3 lines
Add new PCI ids to support next generation of BladeEnigne device.
Signed-off-by Ajit Khaparde <[email protected]>Applied.
I have to revert your changes, how did this even build for you?
In file included from
drivers/net/benet/be_cmds.c:18:drivers/net/benet/be.h:45:1: warning: "BE_DEVICE_ID1" redefineddrivers/net/benet/be.h:44:1: warning: this is the location of the previous definitiondrivers/net/benet/be.h:48:1: warning: "OC_DEVICE_ID2" redefineddrivers/net/benet/be.h:47:1: warning: this is the location of the previous definitionWell, obviously, since in your patch:
#define
BE_VENDOR_ID0x19a2
#defineBE_DEVICE_ID10x211drivers/net/benet/be.h +2
-0+#define BE_DEVICE_ID1 0x221#define OC_DEVICE_ID1 0x700#define OC_DEVICE_ID2 0x701 +#define OC_DEVICE_ID2 0x710
Quoted 8 lines
drivers/net/benet/be.h:56: error: 'OC_DEVICE_ID3' undeclared (first use in this function)drivers/net/benet/be.h:58: error: 'BE_DEVICE_ID2' undeclared (first use in this function)The mistake is obvious, and you provably didn't even compile check these changes.
How can I possibly take your patches seriously when it is clear how incredibly careless you are being here?
Sorry Dave. My bad. Now I realize what happened.
After I compiled and tried my changes, the setup got rebooted and I picked the files from a wrong sandbox. And these wrong files got committed to git. I will be careful next time.