Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

This commit is contained in:
David S. Miller 2009-09-10 18:17:09 -07:00
commit 9a0da0d19c
107 changed files with 373 additions and 1856 deletions

View file

@ -1011,7 +1011,7 @@ replay:
}
static struct nlattr *
find_dump_kind(struct nlmsghdr *n)
find_dump_kind(const struct nlmsghdr *n)
{
struct nlattr *tb1, *tb2[TCA_ACT_MAX+1];
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];