diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /include/linux/if_ppp.h | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/if_ppp.h')
| -rw-r--r-- | include/linux/if_ppp.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h index fcef103aa3f6..c9ad38322576 100644 --- a/include/linux/if_ppp.h +++ b/include/linux/if_ppp.h | |||
| @@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats { | |||
| 114 | __u16 tunnel_id; /* redundant */ | 114 | __u16 tunnel_id; /* redundant */ |
| 115 | __u16 session_id; /* if zero, get tunnel stats */ | 115 | __u16 session_id; /* if zero, get tunnel stats */ |
| 116 | __u32 using_ipsec:1; /* valid only for session_id == 0 */ | 116 | __u32 using_ipsec:1; /* valid only for session_id == 0 */ |
| 117 | aligned_u64 tx_packets; | 117 | __aligned_u64 tx_packets; |
| 118 | aligned_u64 tx_bytes; | 118 | __aligned_u64 tx_bytes; |
| 119 | aligned_u64 tx_errors; | 119 | __aligned_u64 tx_errors; |
| 120 | aligned_u64 rx_packets; | 120 | __aligned_u64 rx_packets; |
| 121 | aligned_u64 rx_bytes; | 121 | __aligned_u64 rx_bytes; |
| 122 | aligned_u64 rx_seq_discards; | 122 | __aligned_u64 rx_seq_discards; |
| 123 | aligned_u64 rx_oos_packets; | 123 | __aligned_u64 rx_oos_packets; |
| 124 | aligned_u64 rx_errors; | 124 | __aligned_u64 rx_errors; |
| 125 | }; | 125 | }; |
| 126 | 126 | ||
| 127 | #define ifr__name b.ifr_ifrn.ifrn_name | 127 | #define ifr__name b.ifr_ifrn.ifrn_name |