diff options
| author | James Morris <jmorris@namei.org> | 2009-03-27 23:57:13 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-27 23:57:13 -0400 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /net/sched/sch_tbf.c | |
| parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'net/sched/sch_tbf.c')
| -rw-r--r-- | net/sched/sch_tbf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index a2f93c09f3cc..e22dfe85e43e 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
| @@ -236,7 +236,6 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt) | |||
| 236 | struct tc_tbf_qopt *qopt; | 236 | struct tc_tbf_qopt *qopt; |
| 237 | struct qdisc_rate_table *rtab = NULL; | 237 | struct qdisc_rate_table *rtab = NULL; |
| 238 | struct qdisc_rate_table *ptab = NULL; | 238 | struct qdisc_rate_table *ptab = NULL; |
| 239 | struct qdisc_rate_table *tmp; | ||
| 240 | struct Qdisc *child = NULL; | 239 | struct Qdisc *child = NULL; |
| 241 | int max_size,n; | 240 | int max_size,n; |
| 242 | 241 | ||
| @@ -295,13 +294,9 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt) | |||
| 295 | q->tokens = q->buffer; | 294 | q->tokens = q->buffer; |
| 296 | q->ptokens = q->mtu; | 295 | q->ptokens = q->mtu; |
| 297 | 296 | ||
| 298 | tmp = q->R_tab; | 297 | swap(q->R_tab, rtab); |
| 299 | q->R_tab = rtab; | 298 | swap(q->P_tab, ptab); |
| 300 | rtab = tmp; | ||
| 301 | 299 | ||
| 302 | tmp = q->P_tab; | ||
| 303 | q->P_tab = ptab; | ||
| 304 | ptab = tmp; | ||
| 305 | sch_tree_unlock(sch); | 300 | sch_tree_unlock(sch); |
| 306 | err = 0; | 301 | err = 0; |
| 307 | done: | 302 | done: |