Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75356f27 authored by David S. Miller's avatar David S. Miller
Browse files

[DECNET]: Fix build regressions. 



Spotted by Arnaldo.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2404043a

net/decnet/dn_rules.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

net/decnet/dn_table.c

+2 −2
Original line number Diff line number Diff line
@@ -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;