Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14788
b: refs/heads/master
c: c219750
h: refs/heads/master
v: v3
  • Loading branch information
Mitchell Blank Jr authored and David S. Miller committed Nov 30, 2005
1 parent 2986b2a commit 4528c2a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c9933d0856d6d0ede6b4b30e5e7330614f5203af
refs/heads/master: c219750b2e667f4f79f4d8faca5057dad793db87
2 changes: 1 addition & 1 deletion trunk/include/linux/atmdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
11 changes: 7 additions & 4 deletions trunk/net/atm/atm_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 4528c2a

Please sign in to comment.