diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index a8eb97777c0a..1322573b8228 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -2783,7 +2783,7 @@ static bool ipmr_fill_vif(struct mr_table *mrt, u32 vifid, struct sk_buff *skb) | |||
2783 | return true; | 2783 | return true; |
2784 | 2784 | ||
2785 | vif = &mrt->vif_table[vifid]; | 2785 | vif = &mrt->vif_table[vifid]; |
2786 | vif_nest = nla_nest_start(skb, IPMRA_VIF); | 2786 | vif_nest = nla_nest_start_noflag(skb, IPMRA_VIF); |
2787 | if (!vif_nest) | 2787 | if (!vif_nest) |
2788 | return false; | 2788 | return false; |
2789 | if (nla_put_u32(skb, IPMRA_VIFA_IFINDEX, vif->dev->ifindex) || | 2789 | if (nla_put_u32(skb, IPMRA_VIFA_IFINDEX, vif->dev->ifindex) || |
@@ -2867,7 +2867,7 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb) | |||
2867 | memset(hdr, 0, sizeof(*hdr)); | 2867 | memset(hdr, 0, sizeof(*hdr)); |
2868 | hdr->ifi_family = RTNL_FAMILY_IPMR; | 2868 | hdr->ifi_family = RTNL_FAMILY_IPMR; |
2869 | 2869 | ||
2870 | af = nla_nest_start(skb, IFLA_AF_SPEC); | 2870 | af = nla_nest_start_noflag(skb, IFLA_AF_SPEC); |
2871 | if (!af) { | 2871 | if (!af) { |
2872 | nlmsg_cancel(skb, nlh); | 2872 | nlmsg_cancel(skb, nlh); |
2873 | goto out; | 2873 | goto out; |
@@ -2878,7 +2878,7 @@ static int ipmr_rtm_dumplink(struct sk_buff *skb, struct netlink_callback *cb) | |||
2878 | goto out; | 2878 | goto out; |
2879 | } | 2879 | } |
2880 | 2880 | ||
2881 | vifs = nla_nest_start(skb, IPMRA_TABLE_VIFS); | 2881 | vifs = nla_nest_start_noflag(skb, IPMRA_TABLE_VIFS); |
2882 | if (!vifs) { | 2882 | if (!vifs) { |
2883 | nla_nest_end(skb, af); | 2883 | nla_nest_end(skb, af); |
2884 | nlmsg_end(skb, nlh); | 2884 | nlmsg_end(skb, nlh); |