diff options
| author | Rasesh Mody <rmody@brocade.com> | 2011-10-05 07:04:01 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-05 07:04:01 +0400 |
| commit | 70f14381299984f05764c3188f1706288285c953 (patch) | |
| tree | b1adf2899714744db4619c0c8a6bcf04638e91c0 /drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | |
| parent | 83e1b91845403f6322284a6e74581cc47d57de9f (diff) | |
| download | linux-70f14381299984f05764c3188f1706288285c953.tar.xz | |
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_ct.c')
| -rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c index c2d3b1adbca4..348479bbfa3a 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c @@ -454,7 +454,7 @@ bfa_ioc_ct2_lpu_read_stat(struct bfa_ioc *ioc) #define __MSIX_VT_NUMVT_(_v) ((_v) << __MSIX_VT_NUMVT__SH) #define __MSIX_VT_OFST_ 0x000007ff void -bfa_ioc_ct2_poweron(struct bfa_ioc *ioc) +bfa_nw_ioc_ct2_poweron(struct bfa_ioc *ioc) { void __iomem *rb = ioc->pcidev.pci_bar_kva; u32 r32; |