diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-10 21:17:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-10 21:17:09 -0400 |
| commit | 9a0da0d19c573e01aded6ac17747d2efc5b1115f (patch) | |
| tree | 76294327bae4b3e45b16c690bda4b24951f237cf /net/sched | |
| parent | ec282e9225be924479d4880b51f13524795bd8d3 (diff) | |
| parent | 8a56df0ae1690f8f42a3c6c4532f4b06f93febea (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 9d03cc33b6cc..2dfb3e7a040d 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -1011,7 +1011,7 @@ replay: | |||
| 1011 | } | 1011 | } |
| 1012 | 1012 | ||
| 1013 | static struct nlattr * | 1013 | static struct nlattr * |
| 1014 | find_dump_kind(struct nlmsghdr *n) | 1014 | find_dump_kind(const struct nlmsghdr *n) |
| 1015 | { | 1015 | { |
| 1016 | struct nlattr *tb1, *tb2[TCA_ACT_MAX+1]; | 1016 | struct nlattr *tb1, *tb2[TCA_ACT_MAX+1]; |
| 1017 | struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; | 1017 | struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; |