git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
if_tun.h
diff --git
a/include/linux/if_tun.h
b/include/linux/if_tun.h
index 33e489d5bb33ed4e476360577474a90f580e2b2c..72f1c5f47be325444270ec2ccd81fbfea927914b 100644
(file)
--- a/
include/linux/if_tun.h
+++ b/
include/linux/if_tun.h
@@
-21,6
+21,8
@@
/* Uncomment to enable debugging */
/* #define TUN_DEBUG 1 */
+#include <linux/types.h>
+
#ifdef __KERNEL__
#ifdef TUN_DEBUG
@@
-88,7
+90,7
@@
struct tun_struct {
struct tun_pi {
unsigned short flags;
-
unsigned short
proto;
+
__be16
proto;
};
#define TUN_PKT_STRIP 0x0001