Author: nbd Date: 2015-09-17 11:45:34 +0200 (Thu, 17 Sep 2015) New Revision: 46984
Removed: trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch Modified: trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c Log: kernel: remove lantiq specific ATM API hacks and their kernel space users (fixes #20523) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c =================================================================== --- trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c 2015-09-16 12:40:40 UTC (rev 46983) +++ trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c 2015-09-17 09:45:34 UTC (rev 46984) @@ -370,7 +370,9 @@ /* 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 @@ 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 @@ 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 @@ * 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 @@ 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; Deleted: trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch 2015-09-16 12:40:40 UTC (rev 46983) +++ trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch 2015-09-17 09:45:34 UTC (rev 46984) @@ -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 { Deleted: trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch 2015-09-16 12:40:40 UTC (rev 46983) +++ trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch 2015-09-17 09:45:34 UTC (rev 46984) @@ -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 { Deleted: trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch 2015-09-16 12:40:40 UTC (rev 46983) +++ trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch 2015-09-17 09:45:34 UTC (rev 46984) @@ -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 { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
