diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
| commit | 64b1f00a0830e1c53874067273a096b228d83d36 (patch) | |
| tree | dd547b0f1d431d0995b8eaa711cedb92399f31fe /net/ipv6 | |
| parent | 16b99a4f6644d58c94acb4b4253e84049de588c5 (diff) | |
| parent | 5301e3e117d88ef0967ce278912e54757f1a31a2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index de3b1c86b8d3..12c3c8ef3849 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
| @@ -786,7 +786,7 @@ static inline int ip6gre_xmit_ipv4(struct sk_buff *skb, struct net_device *dev) | |||
| 786 | encap_limit = t->parms.encap_limit; | 786 | encap_limit = t->parms.encap_limit; |
| 787 | 787 | ||
| 788 | memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); | 788 | memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); |
| 789 | fl6.flowi6_proto = IPPROTO_IPIP; | 789 | fl6.flowi6_proto = IPPROTO_GRE; |
| 790 | 790 | ||
| 791 | dsfield = ipv4_get_dsfield(iph); | 791 | dsfield = ipv4_get_dsfield(iph); |
| 792 | 792 | ||
| @@ -836,7 +836,7 @@ static inline int ip6gre_xmit_ipv6(struct sk_buff *skb, struct net_device *dev) | |||
| 836 | encap_limit = t->parms.encap_limit; | 836 | encap_limit = t->parms.encap_limit; |
| 837 | 837 | ||
| 838 | memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); | 838 | memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); |
| 839 | fl6.flowi6_proto = IPPROTO_IPV6; | 839 | fl6.flowi6_proto = IPPROTO_GRE; |
| 840 | 840 | ||
| 841 | dsfield = ipv6_get_dsfield(ipv6h); | 841 | dsfield = ipv6_get_dsfield(ipv6h); |
| 842 | if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS) | 842 | if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS) |