aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-09-16 12:08:05 +0000
committerJohn Crispin <john@openwrt.org>2015-09-16 12:08:05 +0000
commite11479771d422ca9d2686c98e050d179201cc841 (patch)
treec9f528e6505dd6579f1abb2bf5bb0815c176b1f7
parent5bf8dd5e5e509cdade63d3ddbf80ae472197f555 (diff)
downloadupstream-e11479771d422ca9d2686c98e050d179201cc841.tar.gz
upstream-e11479771d422ca9d2686c98e050d179201cc841.tar.bz2
upstream-e11479771d422ca9d2686c98e050d179201cc841.zip
kernel: properly guard the lantiq atm abi hack with an ifdef
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 46981
-rw-r--r--target/linux/generic/patches-3.18/652-atm_header_changes.patch4
1 files changed, 3 insertions, 1 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 2d5e4203e5..43e837e518 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,14 @@
--- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h
-@@ -154,6 +154,9 @@
+@@ -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 */
++#endif
};
struct atm_qos {