aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-09-16 08:32:01 +0000
committerJohn Crispin <john@openwrt.org>2015-09-16 08:32:01 +0000
commitf461ffbaad00946d0a7e6809a98b58c65657fa30 (patch)
treec1a8b8c839db0572ad2c2e1bb2419dbcfddaad92 /target/linux/generic/patches-3.18
parentf453508b3ed803dd7a2f6704038ac49740b9e1ce (diff)
downloadupstream-f461ffbaad00946d0a7e6809a98b58c65657fa30.tar.gz
upstream-f461ffbaad00946d0a7e6809a98b58c65657fa30.tar.bz2
upstream-f461ffbaad00946d0a7e6809a98b58c65657fa30.zip
kernel: unbreak the atm abi
the lantiq dsl hack to struct atm_trafprm broke the ABI fix this by moving the variables to the end of the struct Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 46964
Diffstat (limited to 'target/linux/generic/patches-3.18')
-rw-r--r--target/linux/generic/patches-3.18/652-atm_header_changes.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.18/652-atm_header_changes.patch b/target/linux/generic/patches-3.18/652-atm_header_changes.patch
index 7e5685922f..2d5e4203e5 100644
--- a/target/linux/generic/patches-3.18/652-atm_header_changes.patch
+++ b/target/linux/generic/patches-3.18/652-atm_header_changes.patch
@@ -1,12 +1,12 @@
--- 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,9 @@
+ 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 */
+ 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) */
+ };
+
+ struct atm_qos {