vserver 2.0 rc7

[linux-2.6.git] / net / atm / br2684.c

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 02b2556..e6954cf 100644 (file)
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -190,7 +190,7 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
                dev_kfree_skb(skb);
                return 0;
                }
-       atomic_add(skb->truesize, &atmvcc->sk->sk_wmem_alloc);
+       atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
        ATM_SKB(skb)->atm_options = atmvcc->atm_options;
        brdev->stats.tx_packets++;
        brdev->stats.tx_bytes += skb->len;
@@ -557,7 +557,7 @@ Note: we do not have explicit unassign, but look at _push()
        barrier();
        atmvcc->push = br2684_push;
        skb_queue_head_init(&copy);
-       skb_migrate(&atmvcc->sk->sk_receive_queue, &copy);
+       skb_migrate(&sk_atm(atmvcc)->sk_receive_queue, &copy);
        while ((skb = skb_dequeue(&copy)) != NULL) {
                BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
                BRPRIV(skb->dev)->stats.rx_packets--;