Add dev->last_rx = jiffies at time of raw interface packet receive,

for the following net drivers:

Several ham radio, several IrDA, lp4863, pcnet32, saa9730,
wireless orinoco.

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 32b282f995602930c691d79ea47fc4cb0b1a1a39..beafabd51e36bf9bfc018fd5a3fae3f616dc3dc9 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -256,6 +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->stats.rx_packets++;
 }
 

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 9809981333bca324ce60da08cb6ff2ad0cfc903b..e20dc463f6abf8ea9e2108961f76c49084125a84 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -706,6 +706,7 @@ static void do_rxpacket(struct net_device *dev)
        skb->protocol = htons(ETH_P_AX25);
        skb->mac.raw = skb->data;
        netif_rx(skb);
+       dev->last_rx = jiffies;
        bc->stats.rx_packets++;
 }
 

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 6c842a4d67754d5f9d060714d15c8bf89f19ec32..b42de807a617bf65cc8117c43150d0c41709f1dd 100644 (file)
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -254,6 +254,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
        skb->pkt_type = PACKET_HOST;
 
        netif_rx(skb);
+       dev->last_rx = jiffies;
 
        return 0;
 }

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 57320360602743fc9bc826e26ebc65cabc13ffac..d6ee7d23a8f3948d3a8e6b39c6679396a2afdc49 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -223,6 +223,7 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
        skb->protocol = htons(ETH_P_AX25);
        skb->mac.raw = skb->data;
        netif_rx(skb);
+       dev->last_rx = jiffies;
        s->stats.rx_packets++;
 }
 

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 3ff98c8ab7e4b21dcf9475d3886462f19a85b50e..d2e593db080f2b2f1dec8eab287f7da64776523b 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -345,6 +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->rx_packets++;
 }
 

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index fe54dcb1add4126cf85b66d30c805aea6ace8398..99c110a6561e8ee048fc868705ee69a487ea83b6 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1661,6 +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;
        return;
 }
 

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 5a871a8cbc84c7d7fdc69e61960287447c7831e3..7e175b3a51381fc95170ba16a4f3da09f9ae971b 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -528,6 +528,7 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
                                skb->protocol = htons(ETH_P_AX25);
                                skb->mac.raw = skb->data;
                                netif_rx(skb);
+                               dev->last_rx = jiffies;
                                ++yp->stats.rx_packets;
                        }
                }

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index ed926cbea5d42d897ceaf34a6df4a397c4b86794..e24e7697f089d95cf0c95beff8c2cac07a412aa2 100644 (file)
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -1941,6 +1941,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
                        skb->mac.raw  = skb->data;
                        skb->protocol = htons(ETH_P_IRDA);
                        netif_rx(skb);
+                       self->netdev->last_rx = jiffies;
                }
        }
        

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 617c751fec071dd9b72baf4922e9c1bf90829aaa..e39f19002c123194560540cd18f1052e9f4f0208 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -839,6 +839,7 @@ static void irda_usb_receive(struct urb *urb)
         new->mac.raw  = new->data;
         new->protocol = htons(ETH_P_IRDA);
         netif_rx(new);
+               self->netdev->last_rx = jiffies;
 
 done:
        /* Note : at this point, the URB we've just received (urb)

diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index e3e775dbed5ec1d50e0062bda74d9ee05c3371d7..0f89854ef9e14a01cccb6e1bad53e4e62240735d 100644 (file)
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -1570,6 +1570,7 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase)
                        skb->mac.raw  = skb->data;
                        skb->protocol = htons(ETH_P_IRDA);
                        netif_rx(skb);
+                       self->netdev->last_rx = jiffies;
                }
        }
        /* Restore bank register */

diff --git a/drivers/net/irda/smc-ircc.c b/drivers/net/irda/smc-ircc.c
index 95505f732f2248e1974677e03795ede1b508c906..fc789bd02d21c2075724004ad73ef55638cbd8f0 100644 (file)
--- a/drivers/net/irda/smc-ircc.c
+++ b/drivers/net/irda/smc-ircc.c
@@ -957,6 +957,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
        skb->mac.raw  = skb->data;
        skb->protocol = htons(ETH_P_IRDA);
        netif_rx(skb);
+       self->netdev->last_rx = jiffies;
 }
 
 /*

diff --git a/drivers/net/irda/toshoboe.c b/drivers/net/irda/toshoboe.c
index 8e0a750aeca5376af683e9d608edba63a221ddcb..36a1b508dffae2f6a2c2f3fe80c8c7b0cf11d4d7 100644 (file)
--- a/drivers/net/irda/toshoboe.c
+++ b/drivers/net/irda/toshoboe.c
@@ -433,8 +433,10 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
           self->rxs++;
           self->rxs %= RX_SLOTS;
 
-          if (skb)
+          if (skb) {
             netif_rx (skb);
+            self->netdev->last_rx = jiffies;
+          }
 
         }
 

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 000f8389272d08dc8d76d6450736f02597519814..cc0e5ed6ead962bf904f899e47d5943ef4dc4010 100644 (file)
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -637,6 +637,7 @@ static int vlsi_rx_interrupt(struct net_device *ndev)
                                skb->mac.raw = skb->data;
                                skb->protocol = htons(ETH_P_IRDA);
                                netif_rx(skb);                          
+                               ndev->last_rx = jiffies;
                        }
                        else {
                                idev->stats.rx_dropped++;

diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 416256bcbd59df998bcfdefb44cba8aaecc51b10..c5b7ddb002d22c0386734c4d46934fe71c257ac1 100644 (file)
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -923,6 +923,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)
                        skb->mac.raw  = skb->data;
                        skb->protocol = htons(ETH_P_IRDA);
                        netif_rx(skb);
+                       self->netdev->last_rx = jiffies;
                }
        }
        /* Restore set register */

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 85c5c63d781ebe791299b12ba077e1683dd2c4bc..18205071d52b4c5836d1348d2126bc766c3077c3 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -676,6 +676,7 @@ i596_rx_one(struct net_device *dev, volatile struct i596_private *lp,
 
                skb->protocol = eth_type_trans(skb,dev);
                netif_rx(skb);
+               dev->last_rx = jiffies;
                lp->stats.rx_packets++;
        } else {
 #if 0

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 28ba296f2f4d1b32bb9825ac3d28cb301319898d..5df1dcbffd0e6f2335cb9c658ea0d2b3e0dff83d 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1349,6 +1349,7 @@ pcnet32_rx(struct net_device *dev)
                lp->stats.rx_bytes += skb->len;
                skb->protocol=eth_type_trans(skb,dev);
                netif_rx(skb);
+               dev->last_rx = jiffies;
                lp->stats.rx_packets++;
            }
        }

diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index 31ce83f8015440af93b09287c1c738410321e245..5a13fb80c8625c6e1a23ff6338888394199bf62d 100644 (file)
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -685,6 +685,7 @@ static int lan_saa9730_rx(struct net_device *dev)
                                                 len, 0);
                                skb->protocol = eth_type_trans(skb, dev);
                                netif_rx(skb);
+                               dev->last_rx = jiffies;
                        }
                } else {
                        /* We got an error packet. */

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index cdb4f2b33a81d2bc9a0ddf9dffa4406f0fa9d8a7..36c151148d41cd515224319fd2d70cfb0d7a951f 100644 (file)
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1253,6 +1253,7 @@ static void __dldwd_ev_rx(dldwd_priv_t *priv, hermes_t *hw)
 
        /* Pass the packet to the networking stack */
        netif_rx(skb);
+       dev->last_rx = jiffies;
        stats->rx_packets++;
        stats->rx_bytes += length;