Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4ca2374 authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

be2net: add two new pci device ids to pci device table 



Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0f84d0d

drivers/net/benet/be.h

+14 −0
Original line number Diff line number Diff line
@@ -35,8 +35,22 @@ 
#define DRV_VER			"2.0.348"

#define DRV_NAME		"be2net"

#define BE_NAME			"ServerEngines BladeEngine2 10Gbps NIC"

#define OC_NAME			"Emulex OneConnect 10Gbps NIC"

#define DRV_DESC		BE_NAME "Driver"



#define BE_VENDOR_ID 		0x19a2

#define BE_DEVICE_ID1		0x211

#define OC_DEVICE_ID1		0x700

#define OC_DEVICE_ID2		0x701



static inline char *nic_name(struct pci_dev *pdev)

{

	if (pdev->device == OC_DEVICE_ID1 || pdev->device == OC_DEVICE_ID2)

		return OC_NAME;

	else

		return BE_NAME;

}



/* Number of bytes of an RX frame that are copied to skb->data */

#define BE_HDR_LEN 		64

#define BE_MAX_JUMBO_FRAME_SIZE	9018

drivers/net/benet/be_main.c

+5 −5
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ static unsigned int rx_frag_size = 2048; 
module_param(rx_frag_size, uint, S_IRUGO);

MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");



#define BE_VENDOR_ID 		0x19a2

#define BE2_DEVICE_ID_1 	0x0211

static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {

	{ PCI_DEVICE(BE_VENDOR_ID, BE2_DEVICE_ID_1) },

	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },

	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },

	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -1859,7 +1859,7 @@ static int __devinit be_probe(struct pci_dev *pdev, 
	if (status != 0)

		goto stats_clean;



	dev_info(&pdev->dev, BE_NAME " port %d\n", adapter->port_num);

	dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);

	return 0;



stats_clean:
@@ -1873,7 +1873,7 @@ static int __devinit be_probe(struct pci_dev *pdev, 
disable_dev:

	pci_disable_device(pdev);

do_none:

	dev_warn(&pdev->dev, BE_NAME " initialization failed\n");

	dev_err(&pdev->dev, "%s initialization failed\n", nic_name(pdev));

	return status;

}