diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-04 00:11:17 -0500 |
commit | babcda74e9d96bb58fd9c6c5112dbdbff169e695 (patch) | |
tree | fcbe5e70f1fff01ad49504171e964c387a5ad7f8 /drivers/net/hamradio | |
parent | ab2910921064b657610a3b501358a305e13087ea (diff) |
drivers/net: Kill now superfluous ->last_rx stores.
The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.
Drivers need not do it any more.
Some cases had to be skipped over because the drivers
were making use of the ->last_rx value themselves.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/6pack.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 0f501d2ca935..50f1e172ee8f 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
@@ -373,7 +373,6 @@ static void sp_bump(struct sixpack *sp, char cmd) | |||
373 | memcpy(ptr, sp->cooked_buf + 1, count); | 373 | memcpy(ptr, sp->cooked_buf + 1, count); |
374 | skb->protocol = ax25_type_trans(skb, sp->dev); | 374 | skb->protocol = ax25_type_trans(skb, sp->dev); |
375 | netif_rx(skb); | 375 | netif_rx(skb); |
376 | sp->dev->last_rx = jiffies; | ||
377 | sp->dev->stats.rx_packets++; | 376 | sp->dev->stats.rx_packets++; |
378 | 377 | ||
379 | return; | 378 | return; |
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 00bc7fbb6b37..81a65e3a1c05 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
@@ -555,7 +555,6 @@ static void do_rxpacket(struct net_device *dev) | |||
555 | memcpy(cp, bc->hdlcrx.buf, pktlen - 1); | 555 | memcpy(cp, bc->hdlcrx.buf, pktlen - 1); |
556 | skb->protocol = ax25_type_trans(skb, dev); | 556 | skb->protocol = ax25_type_trans(skb, dev); |
557 | netif_rx(skb); | 557 | netif_rx(skb); |
558 | dev->last_rx = jiffies; | ||
559 | bc->stats.rx_packets++; | 558 | bc->stats.rx_packets++; |
560 | } | 559 | } |
561 | 560 | ||
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 74529c832ad1..46f8f3390e7d 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -230,7 +230,6 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty | |||
230 | 230 | ||
231 | skb->protocol = ax25_type_trans(skb, dev); | 231 | skb->protocol = ax25_type_trans(skb, dev); |
232 | netif_rx(skb); | 232 | netif_rx(skb); |
233 | dev->last_rx = jiffies; | ||
234 | unlock: | 233 | unlock: |
235 | 234 | ||
236 | rcu_read_unlock(); | 235 | rcu_read_unlock(); |
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index e8cfadefa4b6..7e4611442237 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
@@ -1283,7 +1283,6 @@ static void rx_bh(struct work_struct *ugli_api) | |||
1283 | memcpy(&data[1], priv->rx_buf[i], cb); | 1283 | memcpy(&data[1], priv->rx_buf[i], cb); |
1284 | skb->protocol = ax25_type_trans(skb, priv->dev); | 1284 | skb->protocol = ax25_type_trans(skb, priv->dev); |
1285 | netif_rx(skb); | 1285 | netif_rx(skb); |
1286 | priv->dev->last_rx = jiffies; | ||
1287 | priv->stats.rx_packets++; | 1286 | priv->stats.rx_packets++; |
1288 | priv->stats.rx_bytes += cb; | 1287 | priv->stats.rx_bytes += cb; |
1289 | } | 1288 | } |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index c258a0586e61..8eba61a1d4ab 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
@@ -162,7 +162,6 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s) | |||
162 | memcpy(cp, s->hdlcrx.buffer, pkt_len - 1); | 162 | memcpy(cp, s->hdlcrx.buffer, pkt_len - 1); |
163 | skb->protocol = ax25_type_trans(skb, dev); | 163 | skb->protocol = ax25_type_trans(skb, dev); |
164 | netif_rx(skb); | 164 | netif_rx(skb); |
165 | dev->last_rx = jiffies; | ||
166 | s->stats.rx_packets++; | 165 | s->stats.rx_packets++; |
167 | } | 166 | } |
168 | 167 | ||
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index b8e25c4624d2..7570c73f18c0 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -303,7 +303,6 @@ static void ax_bump(struct mkiss *ax) | |||
303 | memcpy(skb_put(skb,count), ax->rbuff, count); | 303 | memcpy(skb_put(skb,count), ax->rbuff, count); |
304 | skb->protocol = ax25_type_trans(skb, ax->dev); | 304 | skb->protocol = ax25_type_trans(skb, ax->dev); |
305 | netif_rx(skb); | 305 | netif_rx(skb); |
306 | ax->dev->last_rx = jiffies; | ||
307 | ax->stats.rx_packets++; | 306 | ax->stats.rx_packets++; |
308 | ax->stats.rx_bytes += count; | 307 | ax->stats.rx_bytes += count; |
309 | spin_unlock_bh(&ax->buflock); | 308 | spin_unlock_bh(&ax->buflock); |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index c17e39bc5460..802d1c7c4af1 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -1627,7 +1627,6 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb) | |||
1627 | skb->protocol = ax25_type_trans(skb, scc->dev); | 1627 | skb->protocol = ax25_type_trans(skb, scc->dev); |
1628 | 1628 | ||
1629 | netif_rx(skb); | 1629 | netif_rx(skb); |
1630 | scc->dev->last_rx = jiffies; | ||
1631 | return; | 1630 | return; |
1632 | } | 1631 | } |
1633 | 1632 | ||
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 1c942862a3f4..5407f7486c9c 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -515,7 +515,6 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp) | |||
515 | memcpy(cp, yp->rx_buf, pkt_len - 1); | 515 | memcpy(cp, yp->rx_buf, pkt_len - 1); |
516 | skb->protocol = ax25_type_trans(skb, dev); | 516 | skb->protocol = ax25_type_trans(skb, dev); |
517 | netif_rx(skb); | 517 | netif_rx(skb); |
518 | dev->last_rx = jiffies; | ||
519 | ++yp->stats.rx_packets; | 518 | ++yp->stats.rx_packets; |
520 | } | 519 | } |
521 | } | 520 | } |