diff options
Diffstat (limited to 'drivers/net/sk98lin/skge.c')
-rw-r--r-- | drivers/net/sk98lin/skge.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 05b827f79f54..1ccb2989001c 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
@@ -4212,7 +4212,7 @@ SK_BOOL DualNet; | |||
4212 | Flags); | 4212 | Flags); |
4213 | 4213 | ||
4214 | SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST); | 4214 | SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST); |
4215 | pAC->dev[Param.Para32[0]]->flags &= ~IFF_RUNNING; | 4215 | netif_carrier_off(pAC->dev[Param.Para32[0]]); |
4216 | spin_unlock_irqrestore( | 4216 | spin_unlock_irqrestore( |
4217 | &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock, | 4217 | &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock, |
4218 | Flags); | 4218 | Flags); |
@@ -4355,7 +4355,7 @@ SK_BOOL DualNet; | |||
4355 | } | 4355 | } |
4356 | 4356 | ||
4357 | /* Inform the world that link protocol is up. */ | 4357 | /* Inform the world that link protocol is up. */ |
4358 | pAC->dev[Param.Para32[0]]->flags |= IFF_RUNNING; | 4358 | netif_carrier_on(pAC->dev[Param.Para32[0]]); |
4359 | 4359 | ||
4360 | break; | 4360 | break; |
4361 | case SK_DRV_NET_DOWN: /* SK_U32 Reason */ | 4361 | case SK_DRV_NET_DOWN: /* SK_U32 Reason */ |
@@ -4368,7 +4368,7 @@ SK_BOOL DualNet; | |||
4368 | } else { | 4368 | } else { |
4369 | DoPrintInterfaceChange = SK_TRUE; | 4369 | DoPrintInterfaceChange = SK_TRUE; |
4370 | } | 4370 | } |
4371 | pAC->dev[Param.Para32[1]]->flags &= ~IFF_RUNNING; | 4371 | netif_carrier_off(pAC->dev[Param.Para32[1]]); |
4372 | break; | 4372 | break; |
4373 | case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */ | 4373 | case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */ |
4374 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT, | 4374 | SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT, |
@@ -4961,7 +4961,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
4961 | #ifdef CONFIG_NET_POLL_CONTROLLER | 4961 | #ifdef CONFIG_NET_POLL_CONTROLLER |
4962 | dev->poll_controller = &SkGePollController; | 4962 | dev->poll_controller = &SkGePollController; |
4963 | #endif | 4963 | #endif |
4964 | dev->flags &= ~IFF_RUNNING; | ||
4965 | SET_NETDEV_DEV(dev, &pdev->dev); | 4964 | SET_NETDEV_DEV(dev, &pdev->dev); |
4966 | SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps); | 4965 | SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps); |
4967 | 4966 | ||
@@ -5035,7 +5034,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
5035 | dev->set_mac_address = &SkGeSetMacAddr; | 5034 | dev->set_mac_address = &SkGeSetMacAddr; |
5036 | dev->do_ioctl = &SkGeIoctl; | 5035 | dev->do_ioctl = &SkGeIoctl; |
5037 | dev->change_mtu = &SkGeChangeMtu; | 5036 | dev->change_mtu = &SkGeChangeMtu; |
5038 | dev->flags &= ~IFF_RUNNING; | ||
5039 | SET_NETDEV_DEV(dev, &pdev->dev); | 5037 | SET_NETDEV_DEV(dev, &pdev->dev); |
5040 | SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps); | 5038 | SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps); |
5041 | 5039 | ||