X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fsched%2Fcls_rsvp.h;h=572f06be3b02a181447c1e125056a833687ef017;hb=2c74088e4104a2a82bd773f79ae0344c22eceb8c;hp=232fb919681076f0f5c6321aad6c2fc6a747ced2;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=powerpc.git

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 232fb91968..572f06be3b 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -555,8 +555,7 @@ insert:
 	goto insert;
 
 errout:
-	if (f)
-		kfree(f);
+	kfree(f);
 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.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);