]> git.baikalelectronics.ru Git - kernel.git/commit
bna: Multiple Definition and Interface Setup Fix
authorRasesh Mody <rmody@brocade.com>
Wed, 5 Oct 2011 03:04:01 +0000 (23:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Oct 2011 03:04:01 +0000 (23:04 -0400)
commitd7497178753deea56945c158bc7085011187bfb2
treeb1adf2899714744db4619c0c8a6bcf04638e91c0
parent198d92934ab2bc488fd39d09e4672f77bb0f0468
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>
drivers/net/ethernet/brocade/bna/bfa_ioc.c
drivers/net/ethernet/brocade/bna/bfa_ioc.h
drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c