--- zzzz-none-000/linux-3.10.107/include/uapi/linux/atm.h	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/include/uapi/linux/atm.h	2021-11-10 11:53:56.000000000 +0000
@@ -2,6 +2,11 @@
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
  
+/**
+ * Some part of this file is modified by Ikanos Communications. 
+ *
+ * Copyright (C) 2013-2014 Ikanos Communications.
+ */  
 
 /*
  * WARNING: User-space programs should not #include <linux/atm.h> directly.
@@ -128,17 +133,52 @@
 #define ATM_CBR		2
 #define ATM_VBR		3
 #define ATM_ABR		4
+
+/* bk: Adding support for the VBR for TI DSL chips */
+#ifdef CONFIG_MIPS_UR8
+
+#define ATM_VBR_NRT    ATM_VBR
+#define ATM_VBR_RT     5
+#define ATM_ANYCLASS   6		/* compatible with everything */
+
+#else /* !MIPS_UR8 */
+
 #define ATM_ANYCLASS	5		/* compatible with everything */
+#ifdef CONFIG_LANTIQ
+#define ATM_VBR_NRT     ATM_VBR
+#define ATM_VBR_RT      6
+#define ATM_UBR_PLUS    7
+#define ATM_GFR         8
+#endif /* LANTIQ */
+
+#ifdef CONFIG_MACH_FUSIV
+	#define ATM_UBR_PLUS	6
+	#define ATM_NRTVBR	7	/* FUSIV specific */
+#endif /* FUSIV */
+#endif /* !MIPS_UR8 */
+/* bk: end */
 
 #define ATM_MAX_PCR	-1		/* maximum available PCR */
 
 struct atm_trafprm {
 	unsigned char	traffic_class;	/* traffic class (ATM_UBR, ...) */
+// AVM/TKL: MERGE Ikanos
+#if defined(CONFIG_MACH_FUSIV)
 	int		max_pcr;	/* maximum PCR in cells per second */
 	int		pcr;		/* desired PCR in cells per second */
 	int		min_pcr;	/* minimum PCR in cells per second */
 	int		max_cdv;	/* maximum CDV in microseconds */
 	int		max_sdu;	/* maximum SDU in bytes */
+	int		scr;		/* sustained rate in cells per second */
+	int		mbs;		/* maximum burst size (MBS) in cells */
+	int		cdv;		/* Cell delay varition */
+#else
+	unsigned int	max_pcr;	/* maximum PCR in cells per second */
+	unsigned int	pcr;		/* desired PCR in cells per second */
+	unsigned int	min_pcr;	/* minimum PCR in cells per second */
+	unsigned int	max_cdv;	/* maximum CDV in microseconds */
+	unsigned int	max_sdu;	/* maximum SDU in bytes */
+#endif // CONFIG_MACH_FUSIV
         /* extra params for ABR */
         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
@@ -154,6 +194,16 @@
 	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 */ 
+
+// AVM/TKL: MERGE Ikanos
+#if !defined(CONFIG_MACH_FUSIV)
+	/* extra params for VBR(NRT-VBR) and RT-VBR */
+	/* bk: Adding support for the VBR for TI DSL chips which support this
+	 * QoS */
+	unsigned int scr;		/* sustained rate in cells per second */
+	int	     mbs;		/* maximum burst size (MBS) in cells */
+	int	     cdv;		/* Cell delay varition */
+#endif // !CONFIG_MACH_FUSIV
 };
 
 struct atm_qos {