2001-02-27 02:51:27

by Arnaldo Carvalho de Melo

Subject: [PATCH] dlci: update last_rx after netif_rx

Hi,

Please consider applying.

- Arnaldo

--- linux-2.4.2/drivers/net/wan/dlci.c Tue Feb 13 19:15:05 2001
+++ linux-2.4.2.acme/drivers/net/wan/dlci.c Mon Feb 26 23:43:25 2001
@@ -205,7 +205,7 @@

case FRAD_P_IP:
header = sizeof(hdr->control) + sizeof(hdr->IP_NLPID);
- skb->protocol = htons(ETH_P_IP);
+ skb->protocol = __constant_htons(ETH_P_IP);
process = 1;
break;

@@ -229,6 +229,7 @@
skb_pull(skb, header);
netif_rx(skb);
dlp->stats.rx_packets++;
+ dev->last_rx = jiffies;
}
else
dev_kfree_skb(skb);

2001-02-27 02:56:49

by Jeff Garzik

Subject: Re: [PATCH] dlci: update last_rx after netif_rx

Arnaldo Carvalho de Melo wrote:
> --- linux-2.4.2/drivers/net/wan/dlci.c Tue Feb 13 19:15:05 2001
> +++ linux-2.4.2.acme/drivers/net/wan/dlci.c Mon Feb 26 23:43:25 2001
> @@ -229,6 +229,7 @@
> skb_pull(skb, header);
> netif_rx(skb);
> dlp->stats.rx_packets++;
> + dev->last_rx = jiffies;

You need to update dlp->stats.rx_bytes too.

--
Jeff Garzik | "You see, in this world there's two kinds of
Building 1024 | people, my friend: Those with loaded guns
MandrakeSoft | and those who dig. You dig." --Blondie

2001-02-27 04:10:21

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] dlci: update last_rx after netif_rx

Em Mon, Feb 26, 2001 at 09:56:13PM -0500, Jeff Garzik escreveu:
> Arnaldo Carvalho de Melo wrote:
> > --- linux-2.4.2/drivers/net/wan/dlci.c Tue Feb 13 19:15:05 2001
> > +++ linux-2.4.2.acme/drivers/net/wan/dlci.c Mon Feb 26 23:43:25 2001
> > @@ -229,6 +229,7 @@
> > skb_pull(skb, header);
> > netif_rx(skb);
> > dlp->stats.rx_packets++;
> > + dev->last_rx = jiffies;
>
> You need to update dlp->stats.rx_bytes too.

thanks, updated patch, there was no previous variable with the pkt lenght,
so I've added one, hope is ok.

- Arnaldo


--- linux-2.4.2/drivers/net/wan/dlci.c Tue Feb 13 19:15:05 2001
+++ linux-2.4.2.acme/drivers/net/wan/dlci.c Tue Feb 27 00:03:05 2001
@@ -205,7 +205,7 @@

case FRAD_P_IP:
header = sizeof(hdr->control) + sizeof(hdr->IP_NLPID);
- skb->protocol = htons(ETH_P_IP);
+ skb->protocol = __constant_htons(ETH_P_IP);
process = 1;
break;

@@ -224,11 +224,14 @@

if (process)
{
+ int pktlen = skb->len;
/* we've set up the protocol, so discard the header */
skb->mac.raw = skb->data;
skb_pull(skb, header);
netif_rx(skb);
dlp->stats.rx_packets++;
+ dlp->stats.rx_bytes += pktlen;
+ dev->last_rx = jiffies;
}
else
dev_kfree_skb(skb);