git://git.onelab.eu
/
iproute2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync to iproute2-2.6.16-060323
[iproute2.git]
/
tc
/
q_dsmark.c
diff --git
a/tc/q_dsmark.c
b/tc/q_dsmark.c
index
384e749
..
cdb5bf2
100644
(file)
--- a/
tc/q_dsmark.c
+++ b/
tc/q_dsmark.c
@@
-136,11
+136,9
@@
static int dsmark_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
{
struct rtattr *tb[TCA_DSMARK_MAX+1];
{
struct rtattr *tb[TCA_DSMARK_MAX+1];
- if (opt == NULL)
- return 0;
-
- parse_rtattr_nested(tb, TCA_DSMARK_MAX, opt);
-
+ if (!opt) return 0;
+ memset(tb, 0, sizeof(tb));
+ parse_rtattr(tb, TCA_DSMARK_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt));
if (tb[TCA_DSMARK_MASK]) {
if (!RTA_PAYLOAD(tb[TCA_DSMARK_MASK]))
fprintf(stderr,"dsmark: empty mask\n");
if (tb[TCA_DSMARK_MASK]) {
if (!RTA_PAYLOAD(tb[TCA_DSMARK_MASK]))
fprintf(stderr,"dsmark: empty mask\n");