projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
[deliverable/linux.git]
/
net
/
ipv4
/
gre_demux.c
diff --git
a/net/ipv4/gre_demux.c
b/net/ipv4/gre_demux.c
index de1d119a4497e7d512cba30043f01bb6609f6f2d..b798862b6be5da405c5aad288a39fdad5bb5aeae 100644
(file)
--- a/
net/ipv4/gre_demux.c
+++ b/
net/ipv4/gre_demux.c
@@
-117,6
+117,7
@@
int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
if ((*(u8 *)options & 0xF0) != 0x40)
hdr_len += 4;
}
+ tpi->hdr_len = hdr_len;
return hdr_len;
}
EXPORT_SYMBOL(gre_parse_header);
This page took
0.026096 seconds
and
5
git commands to generate.