[PATCH] compile fix for br2684

[PATCH] compile fix for br2684

[Rik van Riel]

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(&copy);
-	skb_migrate(&atmvcc->recvq, &copy);
+	skb_migrate(&atmvcc->sk->receive_queue, &copy);
 	while ((skb = skb_dequeue(&copy))) {
 		BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
 		BRPRIV(skb->dev)->stats.rx_packets--;

Re: [PATCH] compile fix for br2684

[David S. Miller]

   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.

Re: [PATCH] compile fix for br2684

[chas williams]

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(&copy);
>-	skb_migrate(&atmvcc->recvq, &copy);
>+	skb_migrate(&atmvcc->sk->receive_queue, &copy);
> 	while ((skb = skb_dequeue(&copy))) {
> 		BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
> 		BRPRIV(skb->dev)->stats.rx_packets--;

Re: [PATCH] compile fix for br2684

[Rik van Riel]

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/

Re: [PATCH] compile fix for br2684

[David S. Miller]

   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.