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
This commit is contained in:
parent
9412c4e66c
commit
45b52d4581
4 changed files with 10 additions and 42 deletions
|
@ -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;
|
||||
|
|
|
@ -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 {
|
|
@ -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 {
|
|
@ -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 {
|
Loading…
Reference in a new issue