Commit d21c8bd3 authored by Chas Williams's avatar Chas Williams Committed by David S. Miller

[ATM]: Fix idt77252/sch_atm/pppoatm compilation.

parent e8ced837
...@@ -730,7 +730,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb) ...@@ -730,7 +730,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb)
struct atm_vcc *vcc = vc->tx_vcc; struct atm_vcc *vcc = vc->tx_vcc;
vc->estimator->cells += (skb->len + 47) / 48; 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; u32 cps = vc->estimator->maxcps;
vc->estimator->cps = cps; vc->estimator->cps = cps;
...@@ -2025,7 +2025,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags) ...@@ -2025,7 +2025,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
atomic_inc(&vcc->stats->tx_err); atomic_inc(&vcc->stats->tx_err);
return -ENOMEM; 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; ATM_SKB(skb)->iovcnt = 0;
memcpy(skb_put(skb, 52), cell, 52); memcpy(skb_put(skb, 52), cell, 52);
......
...@@ -231,7 +231,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb) ...@@ -231,7 +231,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
kfree_skb(skb); kfree_skb(skb);
return 1; 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)->iovcnt = 0;
ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options; ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
DPRINTK("(unit %d): atm_skb(%p)->vcc(%p)->dev(%p)\n", DPRINTK("(unit %d): atm_skb(%p)->vcc(%p)->dev(%p)\n",
......
...@@ -508,7 +508,7 @@ static void sch_atm_dequeue(unsigned long data) ...@@ -508,7 +508,7 @@ static void sch_atm_dequeue(unsigned long data)
ATM_SKB(skb)->vcc = flow->vcc; ATM_SKB(skb)->vcc = flow->vcc;
memcpy(skb_push(skb,flow->hdr_len),flow->hdr, memcpy(skb_push(skb,flow->hdr_len),flow->hdr,
flow->hdr_len); 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_SKB(skb)->iovcnt = 0;
/* atm.atm_options are already set by atm_tc_enqueue */ /* atm.atm_options are already set by atm_tc_enqueue */
(void) flow->vcc->send(flow->vcc,skb); (void) flow->vcc->send(flow->vcc,skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment