Small net driver fixes/cleanups related to setting

dev->last_rx equal to jiffies.

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index bc61bd97f6ded99d2ae0dfb7f6f818d2c47df413..e455ac71d802b701283ed546aa54e2c6ecc63c5c 100644 (file)
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -1795,6 +1795,7 @@ speedo_rx(struct net_device *dev)
                        }
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_rx(skb);
+                       dev->last_rx = jiffies;
                        sp->stats.rx_packets++;
                        sp->stats.rx_bytes += pkt_len;
                }

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index beafabd51e36bf9bfc018fd5a3fae3f616dc3dc9..26f08dce4b20a4ab9cf20a2137ca31e60105ae17 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -256,7 +256,7 @@ static void sp_bump(struct sixpack *sp, char cmd)
        skb->mac.raw = skb->data;
        skb->protocol = htons(ETH_P_AX25);
        netif_rx(skb);
-       dev->last_rx = jiffies;
+       sp->dev->last_rx = jiffies;
        sp->stats.rx_packets++;
 }
 
@@ -701,7 +701,6 @@ static struct tty_ldisc sp_ldisc = {
 /* Initialize 6pack control device -- register 6pack line discipline */
 
 static char msg_banner[]  __initdata = KERN_INFO "AX.25: 6pack driver, " SIXPACK_VERSION " (dynamic channels, max=%d)\n";
-static char msg_invparm[] __initdata = KERN_ERR  "6pack: sixpack_maxdev parameter too large.\n";
 static char msg_nomem[]   __initdata = KERN_ERR  "6pack: can't allocate sixpack_ctrls[] array! No 6pack available.\n";
 static char msg_regfail[] __initdata = KERN_ERR  "6pack: can't register line discipline (err = %d)\n";
 

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 2fcf1ff4af27f37ac384fdff71947f2671f23d80..9f237af5479b4b757f772eca2f5c276a9df0f779 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -1121,6 +1121,7 @@ static void rx_bh(void *arg) {
       skb->protocol = ntohs(ETH_P_AX25);
       skb->mac.raw = skb->data;
       netif_rx(skb);
+      priv->dev->last_rx = jiffies;
       priv->stats.rx_packets++;
       priv->stats.rx_bytes += cb;
     }

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index d2e593db080f2b2f1dec8eab287f7da64776523b..4f32863e7da8b3b48834592103c2d70b8b70ab5c 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -345,7 +345,7 @@ static void ax_bump(struct ax_disp *ax)
        skb->mac.raw  = skb->data;
        skb->protocol = htons(ETH_P_AX25);
        netif_rx(skb);
-       dev->last_rx = jiffies;
+       tmp_ax->dev->last_rx = jiffies;
        tmp_ax->rx_packets++;
 }
 

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 99c110a6561e8ee048fc868705ee69a487ea83b6..fe404f3660221b35319692bc88d06fe6799e9387 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1661,7 +1661,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
        skb->pkt_type = PACKET_HOST;
        
        netif_rx(skb);
-       dev->last_rx = jiffies;
+       scc->dev->last_rx = jiffies;
        return;
 }
 

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index ba201c9af1c1f5dc0820d8ebc36e1a63d0fe3130..8b341fe6a33bfcf8518a4ebd51a8f02d5c9316f2 100644 (file)
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -597,6 +597,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
                sa1100_irda_rx_alloc(si);
 
                netif_rx(skb);
+               dev->last_rx = jiffies;
        } else {
                /*
                 * Remap the buffer.

diff --git a/drivers/net/strip.c b/drivers/net/strip.c
index 1ae2fb3fb71f19b83995b3ab0e7d754757cbdf2a..98577b85d1389d9cf5b4740d9c41b795aaa9429b 100644 (file)
--- a/drivers/net/strip.c
+++ b/drivers/net/strip.c
@@ -2080,6 +2080,7 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header *header, __u16
 #ifdef EXT_COUNTERS
         strip_info->rx_bytes += packetlen;
 #endif
+        skb->dev->last_rx = jiffies;
         netif_rx(skb);
     }
 }

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 991996da0fb145353bd9637f1c9860c5a7b7c1ec..da81e5390439d50d465f10dff44ceb88c0af7efb 100644 (file)
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -515,8 +515,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, int cur,
                stats->rx_bytes += pkt_len;
                skb->tail += pkt_len;
                skb->len = pkt_len;
-                       if (netif_running(dev))
+               if (netif_running(dev))
                        skb->protocol = htons(ETH_P_HDLC);
+               skb->dev->last_rx = jiffies;
                netif_rx(skb);
                try_get_rx_skb(dpriv, cur, dev);
        } else {

diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index 7f8677c62a04e0a382be35937df42a975c34b149..cd2645791d1eab55b254b413827909db3c19d918 100644 (file)
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -291,6 +291,7 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc *desc, u8 rxin)
 #endif
        port->hdlc.stats.rx_packets++;
        port->hdlc.stats.rx_bytes += skb->len;
+       skb->dev->last_rx = jiffies;
        skb->mac.raw = skb->data;
        skb->dev = hdlc_to_dev(&port->hdlc);
        skb->protocol = htons(ETH_P_HDLC);