bna: Fixed build break for allyesconfig
This is the patch to fix the build break caused by multiple
definitions of symbols between Brocade's FC/FCOE driver(BFA)
and 10G Networking Driver(BNA).
Changes are:
1. locally used functions are made static
2. unused functions are removed
3. using unique namespaces for the function names that must be
globally visible
Signed-off-by: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index 491d148..cbc1d56 100644
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -1365,7 +1365,7 @@
unsigned long flags;
spin_lock_irqsave(&bnad->bna_lock, flags);
- bfa_ioc_timeout((void *) &bnad->bna.device.ioc);
+ bfa_nw_ioc_timeout((void *) &bnad->bna.device.ioc);
spin_unlock_irqrestore(&bnad->bna_lock, flags);
}
@@ -1376,7 +1376,7 @@
unsigned long flags;
spin_lock_irqsave(&bnad->bna_lock, flags);
- bfa_ioc_hb_check((void *) &bnad->bna.device.ioc);
+ bfa_nw_ioc_hb_check((void *) &bnad->bna.device.ioc);
spin_unlock_irqrestore(&bnad->bna_lock, flags);
}
@@ -1387,7 +1387,7 @@
unsigned long flags;
spin_lock_irqsave(&bnad->bna_lock, flags);
- bfa_ioc_sem_timeout((void *) &bnad->bna.device.ioc);
+ bfa_nw_ioc_sem_timeout((void *) &bnad->bna.device.ioc);
spin_unlock_irqrestore(&bnad->bna_lock, flags);
}
@@ -3067,7 +3067,6 @@
}
bnad = netdev_priv(netdev);
-
/*
* PCI initialization
* Output : using_dac = 1 for 64 bit DMA
@@ -3239,7 +3238,7 @@
pr_info("Brocade 10G Ethernet driver\n");
- bfa_ioc_auto_recover(bnad_ioc_auto_recover);
+ bfa_nw_ioc_auto_recover(bnad_ioc_auto_recover);
err = pci_register_driver(&bnad_pci_driver);
if (err < 0) {