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 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
include
/
net
/
gre.h
diff --git
a/include/net/gre.h
b/include/net/gre.h
index
73ea256
..
d25d836
100644
(file)
--- a/
include/net/gre.h
+++ b/
include/net/gre.h
@@
-7,7
+7,15
@@
struct gre_base_hdr {
__be16 flags;
__be16 protocol;
struct gre_base_hdr {
__be16 flags;
__be16 protocol;
-};
+} __packed;
+
+struct gre_full_hdr {
+ struct gre_base_hdr fixed_header;
+ __be16 csum;
+ __be16 reserved1;
+ __be32 key;
+ __be32 seq;
+} __packed;
#define GRE_HEADER_SECTION 4
#define GREPROTO_CISCO 0
#define GRE_HEADER_SECTION 4
#define GREPROTO_CISCO 0