Add changes from the Linux-2.6 tree.

[linux-2.6.git] / net / atm / atm_misc.c

diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index d842ecd..02cc7e7 100644 (file)
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -16,7 +16,7 @@
 int atm_charge(struct atm_vcc *vcc,int truesize)
 {
        atm_force_charge(vcc,truesize);
-       if (atomic_read(&vcc->sk->sk_rmem_alloc) <= vcc->sk->sk_rcvbuf)
+       if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
                return 1;
        atm_return(vcc,truesize);
        atomic_inc(&vcc->stats->rx_drop);
@@ -25,17 +25,18 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
 
 
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags)
+    gfp_t gfp_flags)
 {
+       struct sock *sk = sk_atm(vcc);
        int guess = atm_guess_pdu2truesize(pdu_size);
 
        atm_force_charge(vcc,guess);
-       if (atomic_read(&vcc->sk->sk_rmem_alloc) <= vcc->sk->sk_rcvbuf) {
+       if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) {
                struct sk_buff *skb = alloc_skb(pdu_size,gfp_flags);
 
                if (skb) {
                        atomic_add(skb->truesize-guess,
-                                  &vcc->sk->sk_rmem_alloc);
+                                  &sk->sk_rmem_alloc);
                        return skb;
                }
        }
@@ -73,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;
 }