diff options
Diffstat (limited to 'net/ipv4/xfrm4_policy.c')
-rw-r--r-- | net/ipv4/xfrm4_policy.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index dd1fd8c473fc..4a8c5335770c 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/err.h> | 11 | #include <linux/err.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/inetdevice.h> | 13 | #include <linux/inetdevice.h> |
14 | #include <linux/if_tunnel.h> | ||
14 | #include <net/dst.h> | 15 | #include <net/dst.h> |
15 | #include <net/xfrm.h> | 16 | #include <net/xfrm.h> |
16 | #include <net/ip.h> | 17 | #include <net/ip.h> |
@@ -154,6 +155,20 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) | |||
154 | fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1])); | 155 | fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1])); |
155 | } | 156 | } |
156 | break; | 157 | break; |
158 | |||
159 | case IPPROTO_GRE: | ||
160 | if (pskb_may_pull(skb, xprth + 12 - skb->data)) { | ||
161 | __be16 *greflags = (__be16 *)xprth; | ||
162 | __be32 *gre_hdr = (__be32 *)xprth; | ||
163 | |||
164 | if (greflags[0] & GRE_KEY) { | ||
165 | if (greflags[0] & GRE_CSUM) | ||
166 | gre_hdr++; | ||
167 | fl->fl_gre_key = gre_hdr[1]; | ||
168 | } | ||
169 | } | ||
170 | break; | ||
171 | |||
157 | default: | 172 | default: |
158 | fl->fl_ipsec_spi = 0; | 173 | fl->fl_ipsec_spi = 0; |
159 | break; | 174 | break; |