KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: unbreak atm ABI for 4.0 and 4.1

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/generic/patches-4.0/652-atm_header_changes.patch
View file

@ -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 {

16
target/linux/generic/patches-4.1/652-atm_header_changes.patch
View file

@ -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 {