From 7b0f39e296d932f82f7f74749079fcfc794832ae Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 12 Nov 2006 23:02:01 -0800 Subject: [PATCH] --- yaml --- r: 41637 b: refs/heads/master c: 75356f27ed4f85bd789a822bca3fc5e92e334140 h: refs/heads/master i: 41635: 01caff53897555c4cdc9a5ca8c5cbbf9c4306aeb v: v3 --- [refs] | 2 +- trunk/net/decnet/dn_rules.c | 6 ------ trunk/net/decnet/dn_table.c | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3ebd6b7c810d..3d64e6dbff1f 100644 --- 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 index b7dfd04a9638..e32d0c3d5a96 100644 --- 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 index e74b744254ab..9ce58c24a8d3 100644 --- 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;