From: chas williams <chas@locutus.cmf.nrl.navy.mil>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: Andrew Morton <akpm@digeo.com>,
davem@redhat.com, linux-atm-general@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [Linux-ATM-General] Re: 2.5.64-mm8: drivers/atm/idt77252.c doesn't compile
Date: Mon, 17 Mar 2003 10:43:15 -0500 [thread overview]
Message-ID: <200303171543.h2HFhFGi012501@locutus.cmf.nrl.navy.mil> (raw)
In-Reply-To: Your message of "Sun, 16 Mar 2003 16:44:14 +0100." <20030316154414.GB10253@fs.tum.de>
In message <20030316154414.GB10253@fs.tum.de>,Adrian Bunk writes:
> 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
+++ linux/net/sched/sch_atm.c 11 Mar 2003 15:20:25 -0000 1.2
@@ -508,7 +508,7 @@
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
+++ linux/net/atm/pppoatm.c 15 Mar 2003 14:35:27 -0000
@@ -231,7 +231,7 @@
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
+++ linux/drivers/atm/idt77252.c 16 Mar 2003 13:17:56 -0000
@@ -730,7 +730,7 @@
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;
vc->estimator->cps = cps;
@@ -2025,7 +2025,7 @@
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);
next prev parent reply other threads:[~2003-03-17 15:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-16 10:42 2.5.64-mm8 Andrew Morton
2003-03-16 11:45 ` [patch] 2.5.64-mm8: fs/affs/dir.c doesn't compile Adrian Bunk
2003-03-16 12:21 ` 2.5.64-mm8 Roman Zippel
2003-03-16 13:02 ` 2.5.64-mm8: drivers/atm/idt77252.c doesn't compile Adrian Bunk
2003-03-16 15:44 ` Adrian Bunk
2003-03-17 15:43 ` chas williams [this message]
2003-03-18 20:49 ` [Linux-ATM-General] " Adrian Bunk
2003-03-20 8:44 ` David S. Miller
2003-03-16 18:00 ` Adrian Bunk
2003-03-16 13:43 ` [patch] 2.5.64-mm8: miropcm20-rds.c " Adrian Bunk
2003-03-16 13:49 ` 2.5.64-mm8 Mike Galbraith
2003-03-16 17:12 ` 2.5.64-mm8 Helge Hafting
2003-03-16 19:10 ` 2.5.64-mm8: link error with CONFIG_NUMA and !CONFIG_SMP Adrian Bunk
2003-03-16 19:32 ` Martin J. Bligh
2003-03-16 19:44 ` Martin J. Bligh
2003-03-16 19:58 ` Adrian Bunk
2003-03-16 19:20 ` 2.5.64-mm8 Josh McKinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200303171543.h2HFhFGi012501@locutus.cmf.nrl.navy.mil \
--to=chas@locutus.cmf.nrl.navy.mil \
--cc=akpm@digeo.com \
--cc=bunk@fs.tum.de \
--cc=davem@redhat.com \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).