diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
| commit | 9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch) | |
| tree | 6ce8272654896b4d0e05b1c82b8d7d3292284676 /net/atm/atm_misc.c | |
| parent | dce32c781b1c026863a254fe8123dd78c59ad984 (diff) | |
| parent | 3a867b36c3234673e61f883ebc11ad18f80a176f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/atm_misc.c')
| -rw-r--r-- | net/atm/atm_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c index b2113c3454ae..71abc99ec815 100644 --- a/net/atm/atm_misc.c +++ b/net/atm/atm_misc.c | |||
| @@ -25,7 +25,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize) | |||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, | 27 | struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, |
| 28 | int gfp_flags) | 28 | unsigned int __nocast gfp_flags) |
| 29 | { | 29 | { |
| 30 | struct sock *sk = sk_atm(vcc); | 30 | struct sock *sk = sk_atm(vcc); |
| 31 | int guess = atm_guess_pdu2truesize(pdu_size); | 31 | int guess = atm_guess_pdu2truesize(pdu_size); |