2.5.64-mm8: drivers/atm/idt77252.c doesn't compile

2.5.64-mm8: drivers/atm/idt77252.c doesn't compile

Post by chas william » Tue, 18 Mar 2003 17:50:12




Quote:> tx_inuse was removed from struct atm_vcc in include/linux/atmdev.h but
> drivers/atm/idt77252.c still needs it:

it doesnt need it -- it just needs to use the right member.  the following
patch should fix the current errors.  i missed these bits during my
earlier changes.

Index: linux/net/sched/sch_atm.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/sched/sch_atm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- linux/net/sched/sch_atm.c   20 Feb 2003 13:46:33 -0000      1.1.1.1

                        ATM_SKB(skb)->vcc = flow->vcc;
                        memcpy(skb_push(skb,flow->hdr_len),flow->hdr,
                            flow->hdr_len);
-                       atomic_add(skb->truesize,&flow->vcc->tx_inuse);
+                       atomic_add(skb->truesize,&flow->vcc->sk->wmem_alloc);
                        ATM_SKB(skb)->iovcnt = 0;
                        /* atm.atm_options are already set by atm_tc_enqueue */
                        (void) flow->vcc->send(flow->vcc,skb);
Index: linux/net/atm/pppoatm.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/net/atm/pppoatm.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pppoatm.c
--- linux/net/atm/pppoatm.c     20 Feb 2003 13:46:30 -0000      1.1.1.1

                kfree_skb(skb);
                return 1;
        }
-       atomic_add(skb->truesize, &ATM_SKB(skb)->vcc->tx_inuse);
+       atomic_add(skb->truesize, &ATM_SKB(skb)->vcc->sk->wmem_alloc);
        ATM_SKB(skb)->iovcnt = 0;
        ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
        DPRINTK("(unit %d): atm_skb(%p)->vcc(%p)->dev(%p)\n",
Index: linux/drivers/atm/idt77252.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/drivers/atm/idt77252.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 idt77252.c
--- linux/drivers/atm/idt77252.c        20 Feb 2003 13:45:03 -0000      1.1.1.1

                struct atm_vcc *vcc = vc->tx_vcc;

                vc->estimator->cells += (skb->len + 47) / 48;
-               if (atomic_read(&vcc->tx_inuse) > (vcc->sk->sndbuf >> 1)) {
+               if (atomic_read(&vcc->sk->wmem_alloc) > (vcc->sk->sndbuf >> 1)) {
                        u32 cps = vc->estimator->maxcps;


                atomic_inc(&vcc->stats->tx_err);
                return -ENOMEM;
        }
-       atomic_add(skb->truesize + ATM_PDU_OVHD, &vcc->tx_inuse);
+       atomic_add(skb->truesize + ATM_PDU_OVHD, &vcc->sk->wmem_alloc);
        ATM_SKB(skb)->iovcnt = 0;

        memcpy(skb_put(skb, 52), cell, 52);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

2.5.64-mm8: drivers/atm/idt77252.c doesn't compile

Post by Adrian Bun » Wed, 19 Mar 2003 23:00:07




> > tx_inuse was removed from struct atm_vcc in include/linux/atmdev.h but
> > drivers/atm/idt77252.c still needs it:

> it doesnt need it -- it just needs to use the right member.  the following
> patch should fix the current errors.  i missed these bits during my
> earlier changes.
>...

Thanks, your patch fixes all tx_inuse compilation errors I observed.

cu
Adrian

--

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

2.5.64-mm8: drivers/atm/idt77252.c doesn't compile

Post by David S. Mille » Fri, 21 Mar 2003 10:50:14



   Date: Mon, 17 Mar 2003 10:43:15 -0500


   > tx_inuse was removed from struct atm_vcc in include/linux/atmdev.h but
   > drivers/atm/idt77252.c still needs it:

   it doesnt need it -- it just needs to use the right member.  the following
   patch should fix the current errors.  i missed these bits during my
   earlier changes.

Applied, thanks Chas.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

1. 2.5.64-mm8: drivers/atm/idt77252.c doesn't compile

The following problem seems to come from Linus' tree:

tx_inuse was removed from struct atm_vcc in include/linux/atmdev.h but
drivers/atm/idt77252.c still needs it:

<--  snip  -->

...
  gcc -Wp,-MD,drivers/atm/.idt77252.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2 -march=k6
-Iinclude/asm-i386/mach-default -g -nostdinc -iwithprefix include  -g  
-DKBUILD_BASENAME=idt77252 -DKBUILD_MODNAME=idt77252 -c -o
drivers/atm/idt77252.o drivers/atm/idt77252.c
drivers/atm/idt77252.c: In function `alloc_scq':
drivers/atm/idt77252.c:669: warning: unsigned int format, different type arg (arg 5)
drivers/atm/idt77252.c: In function `push_on_scq':
drivers/atm/idt77252.c:733: structure has no member named `tx_inuse'
drivers/atm/idt77252.c: In function `idt77252_send_oam':
drivers/atm/idt77252.c:2028: structure has no member named `tx_inuse'
make[2]: *** [drivers/atm/idt77252.o] Error 1

<--  snip  -->

cu
Adrian

--

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. many problems need you help

3. 2.5.64-mm8: fs/affs/dir.c doesn't compile

4. Lemacs in the future?

5. 2.5.64-mm8: miropcm20-rds.c doesn't compile

6. SCO3.2V4.2 and "smallest" printer

7. drivers/atm/idt77252.c doesn't compile in 2.5.40

8. l_sysid in flock.h

9. 2.5.64-ac3: 3c527.c doesn't compile

10. 2.5.64: cpufreq "userspace" governor doesn't compile

11. 2.5.64-ac4: mpparse.c doesn't compile

12. 2.5.64-ac3: 3c527.c doesn't compile

13. 2.5.64-mm8 breaks MASQ