projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
[cascardo/linux.git]
/
drivers
/
net
/
hamradio
/
mkiss.c
diff --git
a/drivers/net/hamradio/mkiss.c
b/drivers/net/hamradio/mkiss.c
index
85828f1
..
1dfe230
100644
(file)
--- a/
drivers/net/hamradio/mkiss.c
+++ b/
drivers/net/hamradio/mkiss.c
@@
-519,7
+519,7
@@
static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
dev->stats.tx_packets++;
dev->stats.tx_bytes += actual;
dev->stats.tx_packets++;
dev->stats.tx_bytes += actual;
-
ax->dev->trans_start = jiffies
;
+
netif_trans_update(ax->dev)
;
ax->xleft = count - actual;
ax->xhead = ax->xbuff + actual;
}
ax->xleft = count - actual;
ax->xhead = ax->xbuff + actual;
}
@@
-542,7
+542,7
@@
static netdev_tx_t ax_xmit(struct sk_buff *skb, struct net_device *dev)
* May be we must check transmitter timeout here ?
* 14 Oct 1994 Dmitry Gorodchanin.
*/
* May be we must check transmitter timeout here ?
* 14 Oct 1994 Dmitry Gorodchanin.
*/
- if (time_before(jiffies, dev
->trans_start
+ 20 * HZ)) {
+ if (time_before(jiffies, dev
_trans_start(dev)
+ 20 * HZ)) {
/* 20 sec timeout not reached */
return NETDEV_TX_BUSY;
}
/* 20 sec timeout not reached */
return NETDEV_TX_BUSY;
}