lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DECNET]: Fix build regressions.

Browse Source 
Spotted by Arnaldo.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-11-12 23:02:01 -08:00
parent 2404043a66
commit 75356f27ed
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/decnet/dn_rules.c
View File

@@ -241,12 +241,6 @@ static u32 dn_fib_rule_default_pref(void)
return 0; 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) int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb)
{ {
return fib_rules_dump(skb, cb, AF_DECnet); return fib_rules_dump(skb, cb, AF_DECnet);

4
net/decnet/dn_table.c
View File

@@ -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) 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(4) /* RTA_TABLE */
+ nla_total_size(2) /* RTA_DST */ + nla_total_size(2) /* RTA_DST */
+ nla_total_size(4); /* RTA_PRIORITY */ + 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; u32 pid = req ? req->pid : 0;
int err = -ENOBUFS; 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) if (skb == NULL)
goto errout; goto errout;