diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/if_ppp.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 |