summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-09-17 09:45:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-09-17 09:45:34 +0000
commit45b52d458168adc31b15248380419c17d0586c63 (patch)
tree2aa9264226dbff21b1ba0333df54189392da45ef
parent9412c4e66c9cbd3a1977e834e34f9efa32fcb94e (diff)
downloadmtk-20170518-45b52d458168adc31b15248380419c17d0586c63.zip
mtk-20170518-45b52d458168adc31b15248380419c17d0586c63.tar.gz
mtk-20170518-45b52d458168adc31b15248380419c17d0586c63.tar.bz2
kernel: remove lantiq specific ATM API hacks and their kernel space users (fixes #20523)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46984
-rw-r--r--package/kernel/lantiq/ltq-atm/src/ltq_atm.c10
-rw-r--r--target/linux/generic/patches-3.18/652-atm_header_changes.patch14
-rw-r--r--target/linux/generic/patches-4.0/652-atm_header_changes.patch14
-rw-r--r--target/linux/generic/patches-4.1/652-atm_header_changes.patch14
4 files changed, 10 insertions, 42 deletions
diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
index 84ce7fa..658dfdc 100644
--- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
+++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
@@ -370,7 +370,9 @@ static int ppe_open(struct atm_vcc *vcc)
/* check bandwidth */
if ( (vcc->qos.txtp.traffic_class == ATM_CBR && vcc->qos.txtp.max_pcr > (port->tx_max_cell_rate - port->tx_current_cell_rate))
|| (vcc->qos.txtp.traffic_class == ATM_VBR_RT && vcc->qos.txtp.max_pcr > (port->tx_max_cell_rate - port->tx_current_cell_rate))
+#if 0
|| (vcc->qos.txtp.traffic_class == ATM_VBR_NRT && vcc->qos.txtp.scr > (port->tx_max_cell_rate - port->tx_current_cell_rate))
+#endif
|| (vcc->qos.txtp.traffic_class == ATM_UBR_PLUS && vcc->qos.txtp.min_pcr > (port->tx_max_cell_rate - port->tx_current_cell_rate)) )
{
ret = -EINVAL;
@@ -408,7 +410,9 @@ static int ppe_open(struct atm_vcc *vcc)
port->tx_current_cell_rate += vcc->qos.txtp.max_pcr;
break;
case ATM_VBR_NRT:
+#if 0
port->tx_current_cell_rate += vcc->qos.txtp.scr;
+#endif
break;
case ATM_UBR_PLUS:
port->tx_current_cell_rate += vcc->qos.txtp.min_pcr;
@@ -486,7 +490,9 @@ static void ppe_close(struct atm_vcc *vcc)
port->tx_current_cell_rate -= vcc->qos.txtp.max_pcr;
break;
case ATM_VBR_NRT:
+#if 0
port->tx_current_cell_rate -= vcc->qos.txtp.scr;
+#endif
break;
case ATM_UBR_PLUS:
port->tx_current_cell_rate -= vcc->qos.txtp.min_pcr;
@@ -1159,10 +1165,13 @@ static void set_qsb(struct atm_vcc *vcc, struct atm_qos *qos, unsigned int queue
* Sustained Cell Rate (SCR) Leaky Bucket Shaper VBR.0/VBR.1
*/
if ( qos->txtp.traffic_class == ATM_VBR_RT || qos->txtp.traffic_class == ATM_VBR_NRT ) {
+#if 0
if ( qos->txtp.scr == 0 ) {
+#endif
/* disable shaper */
qsb_queue_vbr_parameter_table.bit.taus = 0;
qsb_queue_vbr_parameter_table.bit.ts = 0;
+#if 0
} else {
/* Cell Loss Priority (CLP) */
if ( (vcc->atm_options & ATM_ATMOPT_CLP) )
@@ -1182,6 +1191,7 @@ static void set_qsb(struct atm_vcc *vcc, struct atm_qos *qos, unsigned int queue
else
qsb_queue_vbr_parameter_table.bit.taus = tmp;
}
+#endif
} else {
qsb_queue_vbr_parameter_table.bit.taus = 0;
qsb_queue_vbr_parameter_table.bit.ts = 0;
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
deleted file mode 100644
index 43e837e..0000000
--- a/target/linux/generic/patches-3.18/652-atm_header_changes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/include/uapi/linux/atm.h
-+++ b/include/uapi/linux/atm.h
-@@ -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 {
diff --git a/target/linux/generic/patches-4.0/652-atm_header_changes.patch b/target/linux/generic/patches-4.0/652-atm_header_changes.patch
deleted file mode 100644
index 43e837e..0000000
--- a/target/linux/generic/patches-4.0/652-atm_header_changes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/include/uapi/linux/atm.h
-+++ b/include/uapi/linux/atm.h
-@@ -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 {
diff --git a/target/linux/generic/patches-4.1/652-atm_header_changes.patch b/target/linux/generic/patches-4.1/652-atm_header_changes.patch
deleted file mode 100644
index 43e837e..0000000
--- a/target/linux/generic/patches-4.1/652-atm_header_changes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/include/uapi/linux/atm.h
-+++ b/include/uapi/linux/atm.h
-@@ -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 {