diff options
| author |   Rasesh Mody <rmody@brocade.com> | 2011-10-04 23:04:01 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-10-04 23:04:01 -0400 |
| commit | 70f14381299984f05764c3188f1706288285c953 (patch) | |
| tree | b1adf2899714744db4619c0c8a6bcf04638e91c0 /drivers/net/ethernet/brocade/bna/bfa_ioc.c | |
| parent | NET: white space/coding style cleanup of asix driver (diff) | |
| download | linux-dev-70f14381299984f05764c3188f1706288285c953.tar.xz linux-dev-70f14381299984f05764c3188f1706288285c953.zip | |
bna: Multiple Definition and Interface Setup Fix
drivers/net/built-in.o: In function `bfa_ioc_ct2_poweron':
(.text+0xcdc90): multiple definition of `bfa_ioc_ct2_poweron'
drivers/scsi/built-in.o:(.text+0x17f9a0): first defined here
This patch renames bfa_ioc_ct2_poweron() to bfa_nw_ioc_ct2_poweron() to avoid
multiple definition with Brocade scsi driver. It also modifies asic specific
interface setup to allocate MSIX resources at power on in case of 1860 HW with
no asic block and warns if the asic gen is neither BFI_ASIC_GEN_CT nor
BFI_ASIC_GEN_CT2.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bfa_ioc.c')
| -rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index e02d6071a9c4..b0307a00a109 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c @@ -2006,8 +2006,11 @@ bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev, */ if (ioc->asic_gen == BFI_ASIC_GEN_CT) bfa_nw_ioc_set_ct_hwif(ioc); - else + else { + WARN_ON(ioc->asic_gen != BFI_ASIC_GEN_CT2); bfa_nw_ioc_set_ct2_hwif(ioc); + bfa_nw_ioc_ct2_poweron(ioc); + } bfa_ioc_map_port(ioc); bfa_ioc_reg_init(ioc); |