diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2012-11-06 17:49:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-07 16:59:52 -0500 |
| commit | dbf0f2a7998363bb89bd26a5f8579d1f58b58715 (patch) | |
| tree | 56980328c85bfdd258c4df1e97e64a190f1aa359 /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | 1bc8e7e4f36c0c19dd7dea29e7c248b7c6ef3a15 (diff) | |
be2net: remove roce on lancer
roce interface is suppored only on Skyhawk-R.
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 5c475cc333a..b2c72b88af6 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -3621,8 +3621,6 @@ static void be_unmap_pci_bars(struct be_adapter *adapter) { if (adapter->db) pci_iounmap(adapter->pdev, adapter->db); - if (adapter->roce_db.base) - pci_iounmap(adapter->pdev, adapter->roce_db.base); } static int db_bar(struct be_adapter *adapter) @@ -3635,19 +3633,7 @@ static int db_bar(struct be_adapter *adapter) static int be_roce_map_pci_bars(struct be_adapter *adapter) { - struct pci_dev *pdev = adapter->pdev; - u8 __iomem *addr; - - if (lancer_chip(adapter) && adapter->if_type == SLI_INTF_TYPE_3) { - addr = pci_iomap(pdev, 2, 0); - if (addr == NULL) - return -ENOMEM; - - adapter->roce_db.base = addr; - adapter->roce_db.io_addr = pci_resource_start(pdev, 2); - adapter->roce_db.size = 8192; - adapter->roce_db.total_size = pci_resource_len(pdev, 2); - } else if (skyhawk_chip(adapter)) { + if (skyhawk_chip(adapter)) { adapter->roce_db.size = 4096; adapter->roce_db.io_addr = pci_resource_start(adapter->pdev, db_bar(adapter)); |