|
|
@@ -292,7 +292,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
__skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
|
|
|
|
|
|
err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
|
|
|
-@@ -963,6 +1102,7 @@ static void init_tel_txopt(struct ipv6_t
|
|
|
+@@ -971,6 +1110,7 @@ static void init_tel_txopt(struct ipv6_t
|
|
|
opt->ops.opt_nflen = 8;
|
|
|
}
|
|
|
|
|
|
@@ -300,7 +300,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
/**
|
|
|
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
|
|
|
* @t: the outgoing tunnel device
|
|
|
-@@ -1305,6 +1445,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
+@@ -1313,6 +1453,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
{
|
|
|
struct ip6_tnl *t = netdev_priv(dev);
|
|
|
struct ipv6hdr *ipv6h;
|
|
|
@@ -308,7 +308,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
int encap_limit = -1;
|
|
|
__u16 offset;
|
|
|
struct flowi6 fl6;
|
|
|
-@@ -1372,6 +1513,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
+@@ -1380,6 +1521,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
|
|
|
dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
|
|
|
|
|
|
@@ -327,7 +327,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
|
|
return -1;
|
|
|
|
|
|
-@@ -1498,6 +1651,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
+@@ -1506,6 +1659,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
t->parms.link = p->link;
|
|
|
t->parms.proto = p->proto;
|
|
|
t->parms.fwmark = p->fwmark;
|
|
|
@@ -342,7 +342,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
dst_cache_reset(&t->dst_cache);
|
|
|
ip6_tnl_link_config(t);
|
|
|
return 0;
|
|
|
-@@ -1536,6 +1697,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
+@@ -1544,6 +1705,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
p->flowinfo = u->flowinfo;
|
|
|
p->link = u->link;
|
|
|
p->proto = u->proto;
|
|
|
@@ -350,7 +350,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
memcpy(p->name, u->name, sizeof(u->name));
|
|
|
}
|
|
|
|
|
|
-@@ -1920,6 +2082,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
+@@ -1928,6 +2090,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -366,7 +366,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
static void ip6_tnl_netlink_parms(struct nlattr *data[],
|
|
|
struct __ip6_tnl_parm *parms)
|
|
|
{
|
|
|
-@@ -1957,6 +2128,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
+@@ -1965,6 +2136,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
|
|
|
if (data[IFLA_IPTUN_FWMARK])
|
|
|
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
|
|
|
@@ -413,7 +413,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
}
|
|
|
|
|
|
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
|
|
|
-@@ -2072,6 +2283,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
+@@ -2080,6 +2291,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
|
|
|
static size_t ip6_tnl_get_size(const struct net_device *dev)
|
|
|
{
|
|
|
@@ -426,7 +426,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
return
|
|
|
/* IFLA_IPTUN_LINK */
|
|
|
nla_total_size(4) +
|
|
|
-@@ -2101,6 +2318,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
+@@ -2109,6 +2326,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
nla_total_size(0) +
|
|
|
/* IFLA_IPTUN_FWMARK */
|
|
|
nla_total_size(4) +
|
|
|
@@ -451,7 +451,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
0;
|
|
|
}
|
|
|
|
|
|
-@@ -2108,6 +2343,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
+@@ -2116,6 +2351,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
{
|
|
|
struct ip6_tnl *tunnel = netdev_priv(dev);
|
|
|
struct __ip6_tnl_parm *parm = &tunnel->parms;
|
|
|
@@ -461,7 +461,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
|
|
|
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
|
|
|
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
|
|
|
-@@ -2117,9 +2355,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
+@@ -2125,9 +2363,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
|
|
|
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
|
|
|
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
|
|
|
@@ -490,7 +490,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
|
|
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
|
|
|
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
|
|
|
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
|
|
|
-@@ -2159,6 +2415,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
+@@ -2167,6 +2423,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
|
|
|
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
|
|
|
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
|
