projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
net
/
atm
/
atm_misc.c
diff --git
a/net/atm/atm_misc.c
b/net/atm/atm_misc.c
index f41f02656ff41a18adefdcf33423b15c1aed785f..876fbe83e2e4db5ded907ea9938c435edc059e0c 100644
(file)
--- 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) {