projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
[cascardo/linux.git]
/
include
/
net
/
gre.h
diff --git
a/include/net/gre.h
b/include/net/gre.h
index
7a54a31
..
73ea256
100644
(file)
--- a/
include/net/gre.h
+++ b/
include/net/gre.h
@@
-104,6
+104,7
@@
static inline void gre_build_header(struct sk_buff *skb, int hdr_len,
skb_push(skb, hdr_len);
+ skb_set_inner_protocol(skb, proto);
skb_reset_transport_header(skb);
greh = (struct gre_base_hdr *)skb->data;
greh->flags = gre_tnl_flags_to_gre_flags(flags);