---

yaml --- r: 41637 b: refs/heads/master c: 75356f2 h: refs/heads/master i: 41635: 01caff5 v: v3
git-mirror · Dec 3, 2006 · 7b0f39e · 7b0f39e
1 parent e876a97
commit 7b0f39e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2404043a665a9f4c748ab81eef29c76b3e443801
+refs/heads/master: 75356f27ed4f85bd789a822bca3fc5e92e334140
diff --git a/trunk/net/decnet/dn_rules.c b/trunk/net/decnet/dn_rules.c
@@ -241,12 +241,6 @@ static u32 dn_fib_rule_default_pref(void)
 	return 0;
 }
 
-static size_t dn_fib_rule_nlmsg_payload(struct fib_rule *rule)
-{
-	return nla_total_size(2) /* dst */
-	       + nla_total_size(2); /* src */
-}
-
 int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb)
 {
 	return fib_rules_dump(skb, cb, AF_DECnet);

diff --git a/trunk/net/decnet/dn_table.c b/trunk/net/decnet/dn_table.c
@@ -265,7 +265,7 @@ static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct dn_kern
 
 static inline size_t dn_fib_nlmsg_size(struct dn_fib_info *fi)
 {
-	size_t payload = NLMSG_ALIGN(struct rtmsg)
+	size_t payload = NLMSG_ALIGN(sizeof(struct rtmsg))
 			 + nla_total_size(4) /* RTA_TABLE */
 			 + nla_total_size(2) /* RTA_DST */
 			 + nla_total_size(4); /* RTA_PRIORITY */
@@ -361,7 +361,7 @@ static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id,
         u32 pid = req ? req->pid : 0;
 	int err = -ENOBUFS;
 
-        skb = nlmsg_new(dn_fib_nlmsg_size(DN_FIB_INFO(f), GFP_KERNEL));
+        skb = nlmsg_new(dn_fib_nlmsg_size(DN_FIB_INFO(f)), GFP_KERNEL);
         if (skb == NULL)
 		goto errout;