Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

[sfrench/cifs-2.6.git] / drivers / net / vrf.c

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 7e19051f32303195dc7d4ed9707f237e387a6e29..7dc3bcac350666396cf943fdcb583e0d97c6bf8e 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -957,12 +957,12 @@ static void vrf_ip6_input_dst(struct sk_buff *skb, struct net_device *vrf_dev,
 {
        const struct ipv6hdr *iph = ipv6_hdr(skb);
        struct flowi6 fl6 = {
+               .flowi6_iif     = ifindex,
+               .flowi6_mark    = skb->mark,
+               .flowi6_proto   = iph->nexthdr,
                .daddr          = iph->daddr,
                .saddr          = iph->saddr,
                .flowlabel      = ip6_flowinfo(iph),
-               .flowi6_mark    = skb->mark,
-               .flowi6_proto   = iph->nexthdr,
-               .flowi6_iif     = ifindex,
        };
        struct net *net = dev_net(vrf_dev);
        struct rt6_info *rt6;
@@ -1165,7 +1165,7 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it)
        frh->family = family;
        frh->action = FR_ACT_TO_TBL;
 
-       if (nla_put_u32(skb, FRA_L3MDEV, 1))
+       if (nla_put_u8(skb, FRA_L3MDEV, 1))
                goto nla_put_failure;
 
        if (nla_put_u32(skb, FRA_PRIORITY, FIB_RULE_PREF))