summaryrefslogtreecommitdiffstats
path: root/net/atm/atm_misc.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-01 01:53:40 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-01 01:53:40 -0500
commitc8a4f06e4b27dba425ed49fa603d9257e4cd9ece (patch)
treee303035bfce92ce11306cea1f487513781ef7d06 /net/atm/atm_misc.c
parent4ab432677957e0a064bba3690004d3244de8ad6c (diff)
parent5666c0947ede0432ba5148570aa66ffb9febff5b (diff)
downloadkernel-crypto-c8a4f06e4b27dba425ed49fa603d9257e4cd9ece.tar.gz
kernel-crypto-c8a4f06e4b27dba425ed49fa603d9257e4cd9ece.tar.xz
kernel-crypto-c8a4f06e4b27dba425ed49fa603d9257e4cd9ece.zip
Merge branch 'master'
Diffstat (limited to 'net/atm/atm_misc.c')
-rw-r--r--net/atm/atm_misc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index 223c7ad5bd0..02cc7e71efe 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -74,11 +74,14 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
*/
-int atm_pcr_goal(struct atm_trafprm *tp)
+int atm_pcr_goal(const struct atm_trafprm *tp)
{
- if (tp->pcr && tp->pcr != ATM_MAX_PCR) return -tp->pcr;
- if (tp->min_pcr && !tp->pcr) return tp->min_pcr;
- if (tp->max_pcr != ATM_MAX_PCR) return -tp->max_pcr;
+ if (tp->pcr && tp->pcr != ATM_MAX_PCR)
+ return -tp->pcr;
+ if (tp->min_pcr && !tp->pcr)
+ return tp->min_pcr;
+ if (tp->max_pcr != ATM_MAX_PCR)
+ return -tp->max_pcr;
return 0;
}