diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
| commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
| tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /include/net | |
| parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
| parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/syncppp.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 */ |