* [PATCH] compile fix for br2684
@ 2003-04-17 1:08 Rik van Riel
2003-04-17 1:14 ` David S. Miller
2003-04-17 1:53 ` chas williams
0 siblings, 2 replies; 5+ messages in thread
From: Rik van Riel @ 2003-04-17 1:08 UTC (permalink / raw)
To: chas; +Cc: David S. Miller, Marcelo Tosatti, linux-kernel
It looks like the recent ATM updates forgot br2684.c, here is
the patch needed to make that driver compile.
--- linux-2.4.20/net/atm/br2684.c.compile 2003-04-16 20:41:05.000000000 -0400
+++ linux-2.4.20/net/atm/br2684.c 2003-04-16 20:42:05.000000000 -0400
@@ -188,7 +188,7 @@ static int br2684_xmit_vcc(struct sk_buf
dev_kfree_skb(skb);
return 0;
}
- atomic_add(skb->truesize, &atmvcc->tx_inuse);
+ atomic_add(skb->truesize, &atmvcc->sk->wmem_alloc);
ATM_SKB(skb)->iovcnt = 0;
ATM_SKB(skb)->atm_options = atmvcc->atm_options;
brdev->stats.tx_packets++;
@@ -551,7 +551,7 @@ Note: we do not have explicit unassign,
barrier();
atmvcc->push = br2684_push;
skb_queue_head_init(©);
- skb_migrate(&atmvcc->recvq, ©);
+ skb_migrate(&atmvcc->sk->receive_queue, ©);
while ((skb = skb_dequeue(©))) {
BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
BRPRIV(skb->dev)->stats.rx_packets--;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] compile fix for br2684
2003-04-17 1:08 [PATCH] compile fix for br2684 Rik van Riel
@ 2003-04-17 1:14 ` David S. Miller
2003-04-17 1:53 ` chas williams
1 sibling, 0 replies; 5+ messages in thread
From: David S. Miller @ 2003-04-17 1:14 UTC (permalink / raw)
To: riel; +Cc: chas, marcelo, linux-kernel
From: Rik van Riel <riel@surriel.com>
Date: Wed, 16 Apr 2003 21:08:43 -0400 (EDT)
It looks like the recent ATM updates forgot br2684.c, here is
the patch needed to make that driver compile.
Applied, thanks Rik.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] compile fix for br2684
2003-04-17 1:08 [PATCH] compile fix for br2684 Rik van Riel
2003-04-17 1:14 ` David S. Miller
@ 2003-04-17 1:53 ` chas williams
2003-04-17 2:08 ` Rik van Riel
2003-04-17 2:10 ` David S. Miller
1 sibling, 2 replies; 5+ messages in thread
From: chas williams @ 2003-04-17 1:53 UTC (permalink / raw)
To: Rik van Riel; +Cc: David S. Miller, Marcelo Tosatti, linux-kernel
In message <Pine.LNX.4.44.0304162107370.12494-100000@chimarrao.boston.redhat.com>,Rik van Riel writes:
>It looks like the recent ATM updates forgot br2684.c, here is
>the patch needed to make that driver compile.
forgive me, but i didnt think the recvq to sk->receive_queue changes were
in the 2.4 kernel series yet?
>--- linux-2.4.20/net/atm/br2684.c.compile 2003-04-16 20:41:05.000000000 -0400
>+++ linux-2.4.20/net/atm/br2684.c 2003-04-16 20:42:05.000000000 -0400
>@@ -188,7 +188,7 @@ static int br2684_xmit_vcc(struct sk_buf
> dev_kfree_skb(skb);
> return 0;
> }
>- atomic_add(skb->truesize, &atmvcc->tx_inuse);
>+ atomic_add(skb->truesize, &atmvcc->sk->wmem_alloc);
> ATM_SKB(skb)->iovcnt = 0;
> ATM_SKB(skb)->atm_options = atmvcc->atm_options;
> brdev->stats.tx_packets++;
>@@ -551,7 +551,7 @@ Note: we do not have explicit unassign,
> barrier();
> atmvcc->push = br2684_push;
> skb_queue_head_init(©);
>- skb_migrate(&atmvcc->recvq, ©);
>+ skb_migrate(&atmvcc->sk->receive_queue, ©);
> while ((skb = skb_dequeue(©))) {
> BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
> BRPRIV(skb->dev)->stats.rx_packets--;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] compile fix for br2684
2003-04-17 1:53 ` chas williams
@ 2003-04-17 2:08 ` Rik van Riel
2003-04-17 2:10 ` David S. Miller
1 sibling, 0 replies; 5+ messages in thread
From: Rik van Riel @ 2003-04-17 2:08 UTC (permalink / raw)
To: chas williams; +Cc: David S. Miller, Marcelo Tosatti, linux-kernel
On Wed, 16 Apr 2003, chas williams wrote:
> In message <Pine.LNX.4.44.0304162107370.12494-100000@chimarrao.boston.redhat.com>,Rik van Riel writes:
> >It looks like the recent ATM updates forgot br2684.c, here is
> >the patch needed to make that driver compile.
>
> forgive me, but i didnt think the recvq to sk->receive_queue changes were
> in the 2.4 kernel series yet?
Marcelo pulled them in recently:
$ bk changes | head -20
...
ChangeSet@1.1006.2.33, 2003-04-03 04:39:49-08:00, chas@locutus.cmf.nrl.navy.mil
[ATM]: Fix IPHASE build with debugging enabled.
cheers,
Rik
--
Engineers don't grow up, they grow sideways.
http://www.surriel.com/ http://kernelnewbies.org/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] compile fix for br2684
2003-04-17 1:53 ` chas williams
2003-04-17 2:08 ` Rik van Riel
@ 2003-04-17 2:10 ` David S. Miller
1 sibling, 0 replies; 5+ messages in thread
From: David S. Miller @ 2003-04-17 2:10 UTC (permalink / raw)
To: chas; +Cc: riel, marcelo, linux-kernel
From: chas williams <chas@locutus.cmf.nrl.navy.mil>
Date: Wed, 16 Apr 2003 21:53:24 -0400
forgive me, but i didnt think the recvq to sk->receive_queue changes were
in the 2.4 kernel series yet?
I'm backporting all of your ATM fixes to 2.4.x as you send them to
me for 2.5.x.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2003-04-17 2:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-04-17 1:08 [PATCH] compile fix for br2684 Rik van Riel
2003-04-17 1:14 ` David S. Miller
2003-04-17 1:53 ` chas williams
2003-04-17 2:08 ` Rik van Riel
2003-04-17 2:10 ` David S. Miller
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).