Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 7 insertions, 4 deletions

diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index 223c7ad5bd0f..02cc7e71efea 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;
 }