diff options
| author | chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> | 2011-11-22 12:51:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 16:40:30 -0500 |
| commit | 49f5ed4250c757cb19d953fcac2737a35ca14d76 (patch) | |
| tree | 065c6a559b1b8b0a81f62f100804694a05659484 | |
| parent | 021ac8d387594bdf51d9a279b2f9e9defb614c9b (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>
| -rw-r--r-- | drivers/atm/iphase.c | 4 | ||||
| -rw-r--r-- | include/linux/atmdev.h | 10 | ||||
| -rw-r--r-- | net/atm/atm_misc.c | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 3d0c2b0fed9..9e373ba2030 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); diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 43ea1b2de3e..f4ff882cb2d 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -445,16 +445,6 @@ void vcc_insert_socket(struct sock *sk); void atm_dev_release_vccs(struct atm_dev *dev); -/* - * This is approximately the algorithm used by alloc_skb. - * - */ - -static inline int atm_guess_pdu2truesize(int size) -{ - return SKB_TRUESIZE(size); -} - static inline void atm_force_charge(struct atm_vcc *vcc,int truesize) { diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c index f41f02656ff..876fbe83e2e 100644 --- a/net/atm/atm_misc.c +++ b/net/atm/atm_misc.c @@ -26,7 +26,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size, gfp_t gfp_flags) { struct sock *sk = sk_atm(vcc); - int guess = atm_guess_pdu2truesize(pdu_size); + int guess = SKB_TRUESIZE(pdu_size); atm_force_charge(vcc, guess); if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) { |