From 73fa6d3ffdcec75f79f07011e837ca97752c3e8c Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 23 Jan 2008 20:32:58 -0800 Subject: [PATCH] --- yaml --- r: 79533 b: refs/heads/master c: c96c9471dd86ba24dc3826bf5688b99d3caf3ace h: refs/heads/master i: 79531: abe3bfbb7a65a18357e916f4428f2e52ca87f006 v: v3 --- [refs] | 2 +- trunk/net/sched/act_api.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c9ef5c00c502..1e85c2d57237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d834e04e596d6803cf1074a07fd67e7b5662f1b +refs/heads/master: c96c9471dd86ba24dc3826bf5688b99d3caf3ace diff --git a/trunk/net/sched/act_api.c b/trunk/net/sched/act_api.c index ae077ed208af..2fe0345ddcb1 100644 --- a/trunk/net/sched/act_api.c +++ b/trunk/net/sched/act_api.c @@ -984,11 +984,8 @@ find_dump_kind(struct nlmsghdr *n) struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; struct nlattr *nla[TCAA_MAX + 1]; struct nlattr *kind; - int min_len = NLMSG_LENGTH(sizeof(struct tcamsg)); - int attrlen = n->nlmsg_len - NLMSG_ALIGN(min_len); - struct nlattr *attr = (void *) n + NLMSG_ALIGN(min_len); - if (nla_parse(nla, TCAA_MAX, attr, attrlen, NULL) < 0) + if (nlmsg_parse(n, sizeof(struct tcamsg), nla, TCAA_MAX, NULL) < 0) return NULL; tb1 = nla[TCA_ACT_TAB]; if (tb1 == NULL)