diff options
-rw-r--r-- | drivers/net/bna/bnad.c | 8 | ||||
-rw-r--r-- | drivers/net/bna/bnad_ethtool.c | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index 3c405022d2bb..5e7a0307f853 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c | |||
@@ -3061,6 +3061,9 @@ bnad_pci_probe(struct pci_dev *pdev, | |||
3061 | /* Initialize netdev structure, set up ethtool ops */ | 3061 | /* Initialize netdev structure, set up ethtool ops */ |
3062 | bnad_netdev_init(bnad, using_dac); | 3062 | bnad_netdev_init(bnad, using_dac); |
3063 | 3063 | ||
3064 | /* Set link to down state */ | ||
3065 | netif_carrier_off(netdev); | ||
3066 | |||
3064 | bnad_enable_msix(bnad); | 3067 | bnad_enable_msix(bnad); |
3065 | 3068 | ||
3066 | /* Get resource requirement form bna */ | 3069 | /* Get resource requirement form bna */ |
@@ -3114,11 +3117,6 @@ bnad_pci_probe(struct pci_dev *pdev, | |||
3114 | 3117 | ||
3115 | mutex_unlock(&bnad->conf_mutex); | 3118 | mutex_unlock(&bnad->conf_mutex); |
3116 | 3119 | ||
3117 | /* | ||
3118 | * Make sure the link appears down to the stack | ||
3119 | */ | ||
3120 | netif_carrier_off(netdev); | ||
3121 | |||
3122 | /* Finally, reguister with net_device layer */ | 3120 | /* Finally, reguister with net_device layer */ |
3123 | err = register_netdev(netdev); | 3121 | err = register_netdev(netdev); |
3124 | if (err) { | 3122 | if (err) { |
diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c index 11fa2ea842c1..3011110c2023 100644 --- a/drivers/net/bna/bnad_ethtool.c +++ b/drivers/net/bna/bnad_ethtool.c | |||
@@ -330,10 +330,6 @@ do { \ | |||
330 | 330 | ||
331 | BNAD_GET_REG(PCIE_MISC_REG); | 331 | BNAD_GET_REG(PCIE_MISC_REG); |
332 | 332 | ||
333 | BNAD_GET_REG(HOST_SEM0_REG); | ||
334 | BNAD_GET_REG(HOST_SEM1_REG); | ||
335 | BNAD_GET_REG(HOST_SEM2_REG); | ||
336 | BNAD_GET_REG(HOST_SEM3_REG); | ||
337 | BNAD_GET_REG(HOST_SEM0_INFO_REG); | 333 | BNAD_GET_REG(HOST_SEM0_INFO_REG); |
338 | BNAD_GET_REG(HOST_SEM1_INFO_REG); | 334 | BNAD_GET_REG(HOST_SEM1_INFO_REG); |
339 | BNAD_GET_REG(HOST_SEM2_INFO_REG); | 335 | BNAD_GET_REG(HOST_SEM2_INFO_REG); |