diff options
-rw-r--r-- | drivers/net/wan/syncppp.c | 9 | ||||
-rw-r--r-- | include/net/syncppp.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 29b4b94e4947..327d58589e12 100644 --- 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) | |||
230 | skb->dev=dev; | 230 | skb->dev=dev; |
231 | skb_reset_mac_header(skb); | 231 | skb_reset_mac_header(skb); |
232 | 232 | ||
233 | if (dev->flags & IFF_RUNNING) | ||
234 | { | ||
235 | /* Count received bytes, add FCS and one flag */ | ||
236 | sp->ibytes+= skb->len + 3; | ||
237 | sp->ipkts++; | ||
238 | } | ||
239 | |||
240 | if (!pskb_may_pull(skb, PPP_HEADER_LEN)) { | 233 | if (!pskb_may_pull(skb, PPP_HEADER_LEN)) { |
241 | /* Too small packet, drop it. */ | 234 | /* Too small packet, drop it. */ |
242 | if (sp->pp_flags & PP_DEBUG) | 235 | if (sp->pp_flags & PP_DEBUG) |
@@ -832,7 +825,6 @@ static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type, | |||
832 | sppp_print_bytes ((u8*) (lh+1), len); | 825 | sppp_print_bytes ((u8*) (lh+1), len); |
833 | printk (">\n"); | 826 | printk (">\n"); |
834 | } | 827 | } |
835 | sp->obytes += skb->len; | ||
836 | /* Control is high priority so it doesn't get queued behind data */ | 828 | /* Control is high priority so it doesn't get queued behind data */ |
837 | skb->priority=TC_PRIO_CONTROL; | 829 | skb->priority=TC_PRIO_CONTROL; |
838 | skb->dev = dev; | 830 | skb->dev = dev; |
@@ -875,7 +867,6 @@ static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2) | |||
875 | printk (KERN_WARNING "%s: cisco output: <%xh %xh %xh %xh %xh-%xh>\n", | 867 | printk (KERN_WARNING "%s: cisco output: <%xh %xh %xh %xh %xh-%xh>\n", |
876 | dev->name, ntohl (ch->type), ch->par1, | 868 | dev->name, ntohl (ch->type), ch->par1, |
877 | ch->par2, ch->rel, ch->time0, ch->time1); | 869 | ch->par2, ch->rel, ch->time0, ch->time1); |
878 | sp->obytes += skb->len; | ||
879 | skb->priority=TC_PRIO_CONTROL; | 870 | skb->priority=TC_PRIO_CONTROL; |
880 | skb->dev = dev; | 871 | skb->dev = dev; |
881 | skb_queue_tail(&tx_queue, skb); | 872 | skb_queue_tail(&tx_queue, skb); |
diff --git a/include/net/syncppp.h b/include/net/syncppp.h index e43f4070d892..9e306f7f579a 100644 --- a/include/net/syncppp.h +++ b/include/net/syncppp.h | |||
@@ -43,8 +43,6 @@ struct sppp | |||
43 | u32 pp_rseq; /* remote sequence number */ | 43 | u32 pp_rseq; /* remote sequence number */ |
44 | struct slcp lcp; /* LCP params */ | 44 | struct slcp lcp; /* LCP params */ |
45 | struct sipcp ipcp; /* IPCP params */ | 45 | struct sipcp ipcp; /* IPCP params */ |
46 | u32 ibytes,obytes; /* Bytes in/out */ | ||
47 | u32 ipkts,opkts; /* Packets in/out */ | ||
48 | struct timer_list pp_timer; | 46 | struct timer_list pp_timer; |
49 | struct net_device *pp_if; | 47 | struct net_device *pp_if; |
50 | char pp_link_state; /* Link status */ | 48 | char pp_link_state; /* Link status */ |