summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>2011-11-22 13:51:56 +0100
committerDavid S. Miller <davem@davemloft.net>2011-11-26 22:40:30 +0100
commit49f5ed4250c757cb19d953fcac2737a35ca14d76 (patch)
tree065c6a559b1b8b0a81f62f100804694a05659484 /drivers
parentvirtio_net: return already tracked tx_fifo_errors via virtnet_getstats() (diff)
downloadlinux-49f5ed4250c757cb19d953fcac2737a35ca14d76.tar.xz
linux-49f5ed4250c757cb19d953fcac2737a35ca14d76.zip
atm: eliminate atm_guess_pdu2truesize()
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atm/iphase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 3d0c2b0fed9c..9e373ba20308 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1320,8 +1320,8 @@ static void rx_dle_intr(struct atm_dev *dev)
if (ia_vcc == NULL)
{
atomic_inc(&vcc->stats->rx_err);
+ atm_return(vcc, skb->truesize);
dev_kfree_skb_any(skb);
- atm_return(vcc, atm_guess_pdu2truesize(len));
goto INCR_DLE;
}
// get real pkt length pwang_test
@@ -1334,8 +1334,8 @@ static void rx_dle_intr(struct atm_dev *dev)
atomic_inc(&vcc->stats->rx_err);
IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
length, skb->len);)
+ atm_return(vcc, skb->truesize);
dev_kfree_skb_any(skb);
- atm_return(vcc, atm_guess_pdu2truesize(len));
goto INCR_DLE;
}
skb_trim(skb, length);