diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-08-07 04:05:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 04:05:46 -0400 |
| commit | 3859069bc3358772b08bd91efe9edec39a746ea8 (patch) | |
| tree | 9ffe71711dd98cf511ad21d9990c597de0ac3b2b /include | |
| parent | e2c709b0ba2886b5438b666222b4b3faf82d65a9 (diff) | |
| parent | 867240f7b2a37b1be4ba37d904a9064a96c82099 (diff) | |
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
Diffstat (limited to 'include')
| -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 */ |