|
@@ -296,7 +296,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
|
|
|
__skb_tunnel_rx(skb, t->dev, t->net);
|
|
|
|
|
|
-@@ -1245,6 +1382,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
+@@ -1247,6 +1384,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
__u32 mtu;
|
|
|
u8 tproto;
|
|
|
int err;
|
|
@@ -304,7 +304,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
|
|
|
tproto = ACCESS_ONCE(t->parms.proto);
|
|
|
if ((tproto != IPPROTO_IPV6 && tproto != 0) ||
|
|
|
-@@ -1275,6 +1413,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
+@@ -1277,6 +1415,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
|
|
|
fl6.flowi6_mark = skb->mark;
|
|
|
|
|
@@ -323,7 +323,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
|
|
|
if (err != 0) {
|
|
|
if (err == -EMSGSIZE)
|
|
|
-@@ -1389,6 +1539,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
+@@ -1391,6 +1541,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
t->parms.flowinfo = p->flowinfo;
|
|
|
t->parms.link = p->link;
|
|
|
t->parms.proto = p->proto;
|
|
@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
ip6_tnl_dst_reset(t);
|
|
|
ip6_tnl_link_config(t);
|
|
|
return 0;
|
|
|
-@@ -1427,6 +1585,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
+@@ -1429,6 +1587,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
p->flowinfo = u->flowinfo;
|
|
|
p->link = u->link;
|
|
|
p->proto = u->proto;
|
|
@@ -346,7 +346,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
memcpy(p->name, u->name, sizeof(u->name));
|
|
|
}
|
|
|
|
|
|
-@@ -1722,6 +1881,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
+@@ -1724,6 +1883,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -362,7 +362,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
static void ip6_tnl_netlink_parms(struct nlattr *data[],
|
|
|
struct __ip6_tnl_parm *parms)
|
|
|
{
|
|
|
-@@ -1753,6 +1921,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
+@@ -1755,6 +1923,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
|
|
|
if (data[IFLA_IPTUN_PROTO])
|
|
|
parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
|
|
@@ -409,7 +409,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
}
|
|
|
|
|
|
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
|
|
|
-@@ -1805,6 +2013,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
+@@ -1807,6 +2015,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
|
|
|
static size_t ip6_tnl_get_size(const struct net_device *dev)
|
|
|
{
|
|
@@ -422,7 +422,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
return
|
|
|
/* IFLA_IPTUN_LINK */
|
|
|
nla_total_size(4) +
|
|
|
-@@ -1822,6 +2036,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
+@@ -1824,6 +2038,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
nla_total_size(4) +
|
|
|
/* IFLA_IPTUN_PROTO */
|
|
|
nla_total_size(1) +
|
|
@@ -447,7 +447,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
0;
|
|
|
}
|
|
|
|
|
|
-@@ -1829,6 +2061,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
+@@ -1831,6 +2063,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
{
|
|
|
struct ip6_tnl *tunnel = netdev_priv(dev);
|
|
|
struct __ip6_tnl_parm *parm = &tunnel->parms;
|
|
@@ -457,7 +457,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
|
|
|
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
|
|
|
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
|
|
|
-@@ -1837,8 +2072,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
+@@ -1839,8 +2074,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
|
|
|
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
|
|
|
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
|
|
@@ -486,7 +486,7 @@ Signed-off-by: Steven Barth <[email protected]>
|
|
|
return 0;
|
|
|
|
|
|
nla_put_failure:
|
|
|
-@@ -1862,6 +2116,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
+@@ -1864,6 +2118,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
[IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 },
|
|
|
[IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
|
|
|
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
|