diff options
Diffstat (limited to 'drivers/net/slip.c')
-rw-r--r-- | drivers/net/slip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 89696156c059..fa434fb8fb7c 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
@@ -458,7 +458,7 @@ static void sl_tx_timeout(struct net_device *dev) | |||
458 | * 14 Oct 1994 Dmitry Gorodchanin. | 458 | * 14 Oct 1994 Dmitry Gorodchanin. |
459 | */ | 459 | */ |
460 | #ifdef SL_CHECK_TRANSMIT | 460 | #ifdef SL_CHECK_TRANSMIT |
461 | if (time_before(jiffies, dev->trans_start + 20 * HZ)) { | 461 | if (time_before(jiffies, dev_trans_start(dev) + 20 * HZ)) { |
462 | /* 20 sec timeout not reached */ | 462 | /* 20 sec timeout not reached */ |
463 | goto out; | 463 | goto out; |
464 | } | 464 | } |
@@ -1269,7 +1269,7 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1269 | 1269 | ||
1270 | case SIOCGLEASE: | 1270 | case SIOCGLEASE: |
1271 | *p = sl->leased; | 1271 | *p = sl->leased; |
1272 | }; | 1272 | } |
1273 | spin_unlock_bh(&sl->lock); | 1273 | spin_unlock_bh(&sl->lock); |
1274 | return 0; | 1274 | return 0; |
1275 | } | 1275 | } |