diff options
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 93b32d366611..06c0e5033656 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -11158,7 +11158,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 11158 | if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) | 11158 | if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) |
| 11159 | break; /* We have no PHY */ | 11159 | break; /* We have no PHY */ |
| 11160 | 11160 | ||
| 11161 | if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) | 11161 | if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) || |
| 11162 | ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && | ||
| 11163 | !netif_running(dev))) | ||
| 11162 | return -EAGAIN; | 11164 | return -EAGAIN; |
| 11163 | 11165 | ||
| 11164 | spin_lock_bh(&tp->lock); | 11166 | spin_lock_bh(&tp->lock); |
| @@ -11174,7 +11176,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 11174 | if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) | 11176 | if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) |
| 11175 | break; /* We have no PHY */ | 11177 | break; /* We have no PHY */ |
| 11176 | 11178 | ||
| 11177 | if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) | 11179 | if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) || |
| 11180 | ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) && | ||
| 11181 | !netif_running(dev))) | ||
| 11178 | return -EAGAIN; | 11182 | return -EAGAIN; |
| 11179 | 11183 | ||
| 11180 | spin_lock_bh(&tp->lock); | 11184 | spin_lock_bh(&tp->lock); |