From 4528c2ab5164353cfc571a849cc4066012852e37 Mon Sep 17 00:00:00 2001 From: Mitchell Blank Jr Date: Tue, 29 Nov 2005 16:13:55 -0800 Subject: [PATCH] --- yaml --- r: 14788 b: refs/heads/master c: c219750b2e667f4f79f4d8faca5057dad793db87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/atmdev.h | 2 +- trunk/net/atm/atm_misc.c | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 529781dff6df..a662389aa4b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9933d0856d6d0ede6b4b30e5e7330614f5203af +refs/heads/master: c219750b2e667f4f79f4d8faca5057dad793db87 diff --git a/trunk/include/linux/atmdev.h b/trunk/include/linux/atmdev.h index e7d0593bb576..37e5ee485399 100644 --- a/trunk/include/linux/atmdev.h +++ b/trunk/include/linux/atmdev.h @@ -468,7 +468,7 @@ static inline void atm_dev_put(struct atm_dev *dev) int atm_charge(struct atm_vcc *vcc,int truesize); struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, gfp_t gfp_flags); -int atm_pcr_goal(struct atm_trafprm *tp); +int atm_pcr_goal(const struct atm_trafprm *tp); void vcc_release_async(struct atm_vcc *vcc, int reply); diff --git a/trunk/net/atm/atm_misc.c b/trunk/net/atm/atm_misc.c index 223c7ad5bd0f..02cc7e71efea 100644 --- a/trunk/net/atm/atm_misc.c +++ b/trunk/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; }