diff options
| author |   Rasesh Mody <rmody@brocade.com> | 2010-08-25 23:00:27 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-25 23:00:27 -0700 |
| commit | 8a891429d1879ae4f37f547ef5c2d68e19277e4a (patch) | |
| tree | ac759c522cbc86c4373d6086ccd800e9aea09c7f /drivers/net/bna/bnad_ethtool.c | |
| parent | r6040: Free irq line on error path (diff) | |
| download | linux-dev-8a891429d1879ae4f37f547ef5c2d68e19277e4a.tar.xz linux-dev-8a891429d1879ae4f37f547ef5c2d68e19277e4a.zip | |
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_ethtool.c')
| -rw-r--r-- | drivers/net/bna/bnad_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c index 7e630f5e8e03..b337bd9bed29 100644 --- a/drivers/net/bna/bnad_ethtool.c +++ b/drivers/net/bna/bnad_ethtool.c @@ -276,7 +276,7 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) if (ioc_attr) { memset(ioc_attr, 0, sizeof(*ioc_attr)); spin_lock_irqsave(&bnad->bna_lock, flags); - bfa_ioc_get_attr(&bnad->bna.device.ioc, ioc_attr); + bfa_nw_ioc_get_attr(&bnad->bna.device.ioc, ioc_attr); spin_unlock_irqrestore(&bnad->bna_lock, flags); strncpy(drvinfo->fw_version, ioc_attr->adapter_attr.fw_ver, |