aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>2011-11-22 07:51:56 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-26 16:40:30 -0500
commit49f5ed4250c757cb19d953fcac2737a35ca14d76 (patch)
tree065c6a559b1b8b0a81f62f100804694a05659484 /drivers/atm
parent021ac8d387594bdf51d9a279b2f9e9defb614c9b (diff)
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/atm')
-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)
1320 if (ia_vcc == NULL) 1320 if (ia_vcc == NULL)
1321 { 1321 {
1322 atomic_inc(&vcc->stats->rx_err); 1322 atomic_inc(&vcc->stats->rx_err);
1323 atm_return(vcc, skb->truesize);
1323 dev_kfree_skb_any(skb); 1324 dev_kfree_skb_any(skb);
1324 atm_return(vcc, atm_guess_pdu2truesize(len));
1325 goto INCR_DLE; 1325 goto INCR_DLE;
1326 } 1326 }
1327 // get real pkt length pwang_test 1327 // get real pkt length pwang_test
@@ -1334,8 +1334,8 @@ static void rx_dle_intr(struct atm_dev *dev)
1334 atomic_inc(&vcc->stats->rx_err); 1334 atomic_inc(&vcc->stats->rx_err);
1335 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)", 1335 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
1336 length, skb->len);) 1336 length, skb->len);)
1337 atm_return(vcc, skb->truesize);
1337 dev_kfree_skb_any(skb); 1338 dev_kfree_skb_any(skb);
1338 atm_return(vcc, atm_guess_pdu2truesize(len));
1339 goto INCR_DLE; 1339 goto INCR_DLE;
1340 } 1340 }
1341 skb_trim(skb, length); 1341 skb_trim(skb, length);