projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TCP] H-TCP: Fix accounting
[powerpc.git]
/
net
/
sched
/
cls_rsvp.h
diff --git
a/net/sched/cls_rsvp.h
b/net/sched/cls_rsvp.h
index
232fb91
..
572f06b
100644
(file)
--- a/
net/sched/cls_rsvp.h
+++ b/
net/sched/cls_rsvp.h
@@
-555,8
+555,7
@@
insert:
goto insert;
errout:
goto insert;
errout:
- if (f)
- kfree(f);
+ kfree(f);
errout2:
tcf_exts_destroy(tp, &e);
return err;
errout2:
tcf_exts_destroy(tp, &e);
return err;
@@
-618,6
+617,7
@@
static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
pinfo.protocol = s->protocol;
pinfo.tunnelid = s->tunnelid;
pinfo.tunnelhdr = f->tunnelhdr;
pinfo.protocol = s->protocol;
pinfo.tunnelid = s->tunnelid;
pinfo.tunnelhdr = f->tunnelhdr;
+ pinfo.pad = 0;
RTA_PUT(skb, TCA_RSVP_PINFO, sizeof(pinfo), &pinfo);
if (f->res.classid)
RTA_PUT(skb, TCA_RSVP_CLASSID, 4, &f->res.classid);
RTA_PUT(skb, TCA_RSVP_PINFO, sizeof(pinfo), &pinfo);
if (f->res.classid)
RTA_PUT(skb, TCA_RSVP_CLASSID, 4, &f->res.classid);