diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-11-12 23:02:01 -0800 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:22:15 -0800 |
commit | 75356f27ed4f85bd789a822bca3fc5e92e334140 (patch) | |
tree | 5e5c0cc71418af0412817b7f1cd84abf980fc00e | |
parent | 2404043a665a9f4c748ab81eef29c76b3e443801 (diff) | |
download | op-kernel-dev-75356f27ed4f85bd789a822bca3fc5e92e334140.zip op-kernel-dev-75356f27ed4f85bd789a822bca3fc5e92e334140.tar.gz |
[DECNET]: Fix build regressions.
Spotted by Arnaldo.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/decnet/dn_rules.c | 6 | ||||
-rw-r--r-- | net/decnet/dn_table.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index b7dfd04..e32d0c3 100644 --- a/net/decnet/dn_rules.c +++ b/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/net/decnet/dn_table.c b/net/decnet/dn_table.c index e74b744..9ce58c2 100644 --- a/net/decnet/dn_table.c +++ b/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; |