kernel: properly guard the lantiq atm abi hack with an ifdef
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 16 Sep 2015 12:08:05 +0000 (12:08 +0000)
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 16 Sep 2015 12:08:05 +0000 (12:08 +0000)
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46981 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.18/652-atm_header_changes.patch

index 2d5e420..43e837e 100644 (file)
@@ -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 {