diff options
author | Rasesh Mody <rmody@brocade.com> | 2010-08-26 02:00:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-26 02:00:27 -0400 |
commit | 8a891429d1879ae4f37f547ef5c2d68e19277e4a (patch) | |
tree | ac759c522cbc86c4373d6086ccd800e9aea09c7f /drivers/net/bna/bnad.c | |
parent | ced1de4c9eeded664e5f1b21cfcb0fb70cc0cde3 (diff) |
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>
Diffstat (limited to 'drivers/net/bna/bnad.c')
-rw-r--r-- | drivers/net/bna/bnad.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index 491d148f88a..cbc1d563a0c 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c | |||
@@ -1365,7 +1365,7 @@ bnad_ioc_timeout(unsigned long data) | |||
1365 | unsigned long flags; | 1365 | unsigned long flags; |
1366 | 1366 | ||
1367 | spin_lock_irqsave(&bnad->bna_lock, flags); | 1367 | spin_lock_irqsave(&bnad->bna_lock, flags); |
1368 | bfa_ioc_timeout((void *) &bnad->bna.device.ioc); | 1368 | bfa_nw_ioc_timeout((void *) &bnad->bna.device.ioc); |
1369 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 1369 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
1370 | } | 1370 | } |
1371 | 1371 | ||
@@ -1376,7 +1376,7 @@ bnad_ioc_hb_check(unsigned long data) | |||
1376 | unsigned long flags; | 1376 | unsigned long flags; |
1377 | 1377 | ||
1378 | spin_lock_irqsave(&bnad->bna_lock, flags); | 1378 | spin_lock_irqsave(&bnad->bna_lock, flags); |
1379 | bfa_ioc_hb_check((void *) &bnad->bna.device.ioc); | 1379 | bfa_nw_ioc_hb_check((void *) &bnad->bna.device.ioc); |
1380 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 1380 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
1381 | } | 1381 | } |
1382 | 1382 | ||
@@ -1387,7 +1387,7 @@ bnad_ioc_sem_timeout(unsigned long data) | |||
1387 | unsigned long flags; | 1387 | unsigned long flags; |
1388 | 1388 | ||
1389 | spin_lock_irqsave(&bnad->bna_lock, flags); | 1389 | spin_lock_irqsave(&bnad->bna_lock, flags); |
1390 | bfa_ioc_sem_timeout((void *) &bnad->bna.device.ioc); | 1390 | bfa_nw_ioc_sem_timeout((void *) &bnad->bna.device.ioc); |
1391 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 1391 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
1392 | } | 1392 | } |
1393 | 1393 | ||
@@ -3067,7 +3067,6 @@ bnad_pci_probe(struct pci_dev *pdev, | |||
3067 | } | 3067 | } |
3068 | bnad = netdev_priv(netdev); | 3068 | bnad = netdev_priv(netdev); |
3069 | 3069 | ||
3070 | |||
3071 | /* | 3070 | /* |
3072 | * PCI initialization | 3071 | * PCI initialization |
3073 | * Output : using_dac = 1 for 64 bit DMA | 3072 | * Output : using_dac = 1 for 64 bit DMA |
@@ -3239,7 +3238,7 @@ bnad_module_init(void) | |||
3239 | 3238 | ||
3240 | pr_info("Brocade 10G Ethernet driver\n"); | 3239 | pr_info("Brocade 10G Ethernet driver\n"); |
3241 | 3240 | ||
3242 | bfa_ioc_auto_recover(bnad_ioc_auto_recover); | 3241 | bfa_nw_ioc_auto_recover(bnad_ioc_auto_recover); |
3243 | 3242 | ||
3244 | err = pci_register_driver(&bnad_pci_driver); | 3243 | err = pci_register_driver(&bnad_pci_driver); |
3245 | if (err < 0) { | 3244 | if (err < 0) { |