ip6mr: fix mfc notification flags
Commit 812e44dd18
("ip6mr: advertise new mfc entries via rtnl") reuses the
function ip6mr_fill_mroute() to notify mfc events.
But this function was used only for dump and thus was always setting the
flag NLM_F_MULTI, which is wrong in case of a single notification.
Libraries like libnl will wait forever for NLMSG_DONE.
CC: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
65886f439a
commit
f518338b16
|
@ -2349,13 +2349,14 @@ int ip6mr_get_route(struct net *net,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
|
static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
|
||||||
u32 portid, u32 seq, struct mfc6_cache *c, int cmd)
|
u32 portid, u32 seq, struct mfc6_cache *c, int cmd,
|
||||||
|
int flags)
|
||||||
{
|
{
|
||||||
struct nlmsghdr *nlh;
|
struct nlmsghdr *nlh;
|
||||||
struct rtmsg *rtm;
|
struct rtmsg *rtm;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), NLM_F_MULTI);
|
nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), flags);
|
||||||
if (nlh == NULL)
|
if (nlh == NULL)
|
||||||
return -EMSGSIZE;
|
return -EMSGSIZE;
|
||||||
|
|
||||||
|
@ -2423,7 +2424,7 @@ static void mr6_netlink_event(struct mr6_table *mrt, struct mfc6_cache *mfc,
|
||||||
if (skb == NULL)
|
if (skb == NULL)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
err = ip6mr_fill_mroute(mrt, skb, 0, 0, mfc, cmd);
|
err = ip6mr_fill_mroute(mrt, skb, 0, 0, mfc, cmd, 0);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
|
@ -2462,7 +2463,8 @@ static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
if (ip6mr_fill_mroute(mrt, skb,
|
if (ip6mr_fill_mroute(mrt, skb,
|
||||||
NETLINK_CB(cb->skb).portid,
|
NETLINK_CB(cb->skb).portid,
|
||||||
cb->nlh->nlmsg_seq,
|
cb->nlh->nlmsg_seq,
|
||||||
mfc, RTM_NEWROUTE) < 0)
|
mfc, RTM_NEWROUTE,
|
||||||
|
NLM_F_MULTI) < 0)
|
||||||
goto done;
|
goto done;
|
||||||
next_entry:
|
next_entry:
|
||||||
e++;
|
e++;
|
||||||
|
@ -2476,7 +2478,8 @@ next_entry:
|
||||||
if (ip6mr_fill_mroute(mrt, skb,
|
if (ip6mr_fill_mroute(mrt, skb,
|
||||||
NETLINK_CB(cb->skb).portid,
|
NETLINK_CB(cb->skb).portid,
|
||||||
cb->nlh->nlmsg_seq,
|
cb->nlh->nlmsg_seq,
|
||||||
mfc, RTM_NEWROUTE) < 0) {
|
mfc, RTM_NEWROUTE,
|
||||||
|
NLM_F_MULTI) < 0) {
|
||||||
spin_unlock_bh(&mfc_unres_lock);
|
spin_unlock_bh(&mfc_unres_lock);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue