OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 465... Line 465...
465 465
466 + 466 +
467 struct atm_trafprm { 467 struct atm_trafprm {
468 unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */ 468 unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */
-   469 int max_pcr; /* maximum PCR in cells per second */
-   470 --- a/net/atm/common.c
-   471 +++ b/net/atm/common.c
-   472 @@ -62,10 +62,16 @@ static void vcc_remove_socket(struct soc
-   473 write_unlock_irq(&vcc_sklist_lock);
-   474 }
-   475
-   476 +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
-   477 +EXPORT_SYMBOL(ifx_atm_alloc_tx);
-   478 +
-   479 static bool vcc_tx_ready(struct atm_vcc *vcc, unsigned int size)
-   480 {
-   481 struct sock *sk = sk_atm(vcc);
-   482
-   483 + if (ifx_atm_alloc_tx != NULL)
-   484 + return ifx_atm_alloc_tx(vcc, size);
-   485 +
-   486 if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
-   487 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
469 int max_pcr; /* maximum PCR in cells per second */ 488 sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
470 --- a/net/atm/proc.c 489 --- a/net/atm/proc.c
471 +++ b/net/atm/proc.c 490 +++ b/net/atm/proc.c
472 @@ -155,7 +155,7 @@ static void *vcc_seq_next(struct seq_fil 491 @@ -155,7 +155,7 @@ static void *vcc_seq_next(struct seq_fil
473 static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) 492 static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)