Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6-omap-h63xx.git] / drivers / net / wan / syncppp.c

diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 29b4b94e49473228da69c848d1c1c4e50287a1cc..327d58589e12885f6aba7792168706b88fc5abce 100644 (file)
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -230,13 +230,6 @@ static void sppp_input (struct net_device *dev, struct sk_buff *skb)
        skb->dev=dev;
        skb_reset_mac_header(skb);
 
-       if (dev->flags & IFF_RUNNING)
-       {
-               /* Count received bytes, add FCS and one flag */
-               sp->ibytes+= skb->len + 3;
-               sp->ipkts++;
-       }
-
        if (!pskb_may_pull(skb, PPP_HEADER_LEN)) {
                /* Too small packet, drop it. */
                if (sp->pp_flags & PP_DEBUG)
@@ -832,7 +825,6 @@ static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,
                        sppp_print_bytes ((u8*) (lh+1), len);
                printk (">\n");
        }
-       sp->obytes += skb->len;
        /* Control is high priority so it doesn't get queued behind data */
        skb->priority=TC_PRIO_CONTROL;
        skb->dev = dev;
@@ -875,7 +867,6 @@ static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2)
                printk (KERN_WARNING "%s: cisco output: <%xh %xh %xh %xh %xh-%xh>\n",
                        dev->name,  ntohl (ch->type), ch->par1,
                        ch->par2, ch->rel, ch->time0, ch->time1);
-       sp->obytes += skb->len;
        skb->priority=TC_PRIO_CONTROL;
        skb->dev = dev;
        skb_queue_tail(&tx_queue, skb);