From: John Crispin Date: Tue, 12 Mar 2013 13:53:01 +0000 (+0000) Subject: ltq-atm: update sock api X-Git-Tag: reboot~10967 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7e1c5b0be86ce6e435a8d32fafe7743463a43344;p=openwrt%2Fstaging%2Fchunkeey.git ltq-atm: update sock api update sock api in lantiq atm driver The ltq-atm driver provides its own replacement for net/atm/common.c:alloc_tx(), defined in ltq_atm.c:atm_alloc_tx(). The read of sk_wmem_alloc is done in the wrong way, starting with commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 in linux mainline it has to be done through a specific wrapper. Signed-off-by: Luca Dariz SVN-Revision: 35991 --- diff --git a/package/platform/lantiq/ltq-atm/src/ltq_atm.c b/package/platform/lantiq/ltq-atm/src/ltq_atm.c index ff4bbfcea4..dcdb0a9c87 100644 --- a/package/platform/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/platform/lantiq/ltq-atm/src/ltq_atm.c @@ -794,7 +794,7 @@ struct sk_buff* atm_alloc_tx(struct atm_vcc *vcc, unsigned int size) return NULL; } /* send buffer overflow */ - if ( atomic_read(&sk_atm(vcc)->sk_wmem_alloc) && !atm_may_send(vcc, size) ) { + if ( sk_wmem_alloc_get(sk_atm(vcc)) && !atm_may_send(vcc, size) ) { pr_err("atm_alloc_tx: send buffer overflow\n"); return NULL; }