aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-09-16 12:40:40 +0000
committerJohn Crispin <john@openwrt.org>2015-09-16 12:40:40 +0000
commit9412c4e66c9cbd3a1977e834e34f9efa32fcb94e (patch)
tree8a3875819bea6060fce6fde007a88e1936438f93
parent4d01d6ccb1abc9939907f82de7e96d63ca8091ed (diff)
downloadupstream-9412c4e66c9cbd3a1977e834e34f9efa32fcb94e.tar.gz
upstream-9412c4e66c9cbd3a1977e834e34f9efa32fcb94e.tar.bz2
upstream-9412c4e66c9cbd3a1977e834e34f9efa32fcb94e.zip
kernel: unbreak atm ABI for 4.0 and 4.1
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 46983
-rw-r--r--target/linux/generic/patches-4.0/652-atm_header_changes.patch16
-rw-r--r--target/linux/generic/patches-4.1/652-atm_header_changes.patch16
2 files changed, 18 insertions, 14 deletions
diff --git a/target/linux/generic/patches-4.0/652-atm_header_changes.patch b/target/linux/generic/patches-4.0/652-atm_header_changes.patch
index 7e5685922f..43e837e518 100644
--- a/target/linux/generic/patches-4.0/652-atm_header_changes.patch
+++ b/target/linux/generic/patches-4.0/652-atm_header_changes.patch
@@ -1,12 +1,14 @@
--- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h
-@@ -139,6 +139,9 @@ struct atm_trafprm {
- int min_pcr; /* minimum PCR in cells per second */
- int max_cdv; /* maximum CDV in microseconds */
- int max_sdu; /* maximum SDU in bytes */
+@@ -154,6 +154,11 @@
+ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */
+ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */
+ unsigned int spare :9; /* spare bits */
++#ifdef CONFIG_LANTIQ
+ int scr; /* sustained rate in cells per second */
+ int mbs; /* maximum burst size (MBS) in cells */
+ int cdv; /* Cell delay varition */
- /* extra params for ABR */
- unsigned int icr; /* Initial Cell Rate (24-bit) */
- unsigned int tbe; /* Transient Buffer Exposure (24-bit) */
++#endif
+ };
+
+ struct atm_qos {
diff --git a/target/linux/generic/patches-4.1/652-atm_header_changes.patch b/target/linux/generic/patches-4.1/652-atm_header_changes.patch
index 7e5685922f..43e837e518 100644
--- a/target/linux/generic/patches-4.1/652-atm_header_changes.patch
+++ b/target/linux/generic/patches-4.1/652-atm_header_changes.patch
@@ -1,12 +1,14 @@
--- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h
-@@ -139,6 +139,9 @@ struct atm_trafprm {
- int min_pcr; /* minimum PCR in cells per second */
- int max_cdv; /* maximum CDV in microseconds */
- int max_sdu; /* maximum SDU in bytes */
+@@ -154,6 +154,11 @@
+ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */
+ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */
+ unsigned int spare :9; /* spare bits */
++#ifdef CONFIG_LANTIQ
+ int scr; /* sustained rate in cells per second */
+ int mbs; /* maximum burst size (MBS) in cells */
+ int cdv; /* Cell delay varition */
- /* extra params for ABR */
- unsigned int icr; /* Initial Cell Rate (24-bit) */
- unsigned int tbe; /* Transient Buffer Exposure (24-bit) */
++#endif
+ };
+
+ struct atm_qos {