From: blogic Date: Wed, 16 Sep 2015 08:32:01 +0000 (+0000) Subject: kernel: unbreak the atm abi X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=c5d4911448898f7fabdd2c4737ed0820ced4fc4d;p=openwrt.git 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46964 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 {