Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

atm: eliminate atm_guess_pdu2truesize()

Browse Source 
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
chas williams - CONTRACTOR 2011-11-22 12:51:56 +00:00 committed by David S. Miller
parent 021ac8d387
commit 49f5ed4250
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/atm/iphase.c
View File

@ -1320,8 +1320,8 @@ static void rx_dle_intr(struct atm_dev *dev)
if (ia_vcc == NULL) if (ia_vcc == NULL)
{ {
atomic_inc(&vcc->stats->rx_err); atomic_inc(&vcc->stats->rx_err);
atm_return(vcc, skb->truesize);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
atm_return(vcc, atm_guess_pdu2truesize(len));
goto INCR_DLE; goto INCR_DLE;
} }
// get real pkt length pwang_test // 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); atomic_inc(&vcc->stats->rx_err);
IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)", IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
length, skb->len);) length, skb->len);)
atm_return(vcc, skb->truesize);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
atm_return(vcc, atm_guess_pdu2truesize(len));
goto INCR_DLE; goto INCR_DLE;
} }
skb_trim(skb, length); skb_trim(skb, length);

10
include/linux/atmdev.h
View File

@ -445,16 +445,6 @@ void vcc_insert_socket(struct sock *sk);
void atm_dev_release_vccs(struct atm_dev *dev); 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) static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
{ {

2
net/atm/atm_misc.c
View File

@ -26,7 +26,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct sock *sk = sk_atm(vcc); struct sock *sk = sk_atm(vcc);
int guess = atm_guess_pdu2truesize(pdu_size); int guess = SKB_TRUESIZE(pdu_size);
atm_force_charge(vcc, guess); atm_force_charge(vcc, guess);
if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) { if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) {