kernel: unbreak atm ABI for 4.0 and 4.1

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 46983
This commit is contained in:
John Crispin 2015-09-16 12:40:40 +00:00
parent 4d01d6ccb1
commit 9412c4e66c
2 changed files with 18 additions and 14 deletions

View file

@ -1,12 +1,14 @@
--- a/include/uapi/linux/atm.h --- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h
@@ -139,6 +139,9 @@ struct atm_trafprm { @@ -154,6 +154,11 @@
int min_pcr; /* minimum PCR in cells per second */ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */
int max_cdv; /* maximum CDV in microseconds */ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */
int max_sdu; /* maximum SDU in bytes */ unsigned int spare :9; /* spare bits */
+#ifdef CONFIG_LANTIQ
+ int scr; /* sustained rate in cells per second */ + int scr; /* sustained rate in cells per second */
+ int mbs; /* maximum burst size (MBS) in cells */ + int mbs; /* maximum burst size (MBS) in cells */
+ int cdv; /* Cell delay varition */ + int cdv; /* Cell delay varition */
/* extra params for ABR */ +#endif
unsigned int icr; /* Initial Cell Rate (24-bit) */ };
unsigned int tbe; /* Transient Buffer Exposure (24-bit) */
struct atm_qos {

View file

@ -1,12 +1,14 @@
--- a/include/uapi/linux/atm.h --- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h
@@ -139,6 +139,9 @@ struct atm_trafprm { @@ -154,6 +154,11 @@
int min_pcr; /* minimum PCR in cells per second */ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */
int max_cdv; /* maximum CDV in microseconds */ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */
int max_sdu; /* maximum SDU in bytes */ unsigned int spare :9; /* spare bits */
+#ifdef CONFIG_LANTIQ
+ int scr; /* sustained rate in cells per second */ + int scr; /* sustained rate in cells per second */
+ int mbs; /* maximum burst size (MBS) in cells */ + int mbs; /* maximum burst size (MBS) in cells */
+ int cdv; /* Cell delay varition */ + int cdv; /* Cell delay varition */
/* extra params for ABR */ +#endif
unsigned int icr; /* Initial Cell Rate (24-bit) */ };
unsigned int tbe; /* Transient Buffer Exposure (24-bit) */
struct atm_qos {