git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'cxgb3', 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus
[pandora-kernel.git]
/
include
/
linux
/
xfrm.h
diff --git
a/include/linux/xfrm.h
b/include/linux/xfrm.h
index
52f3abd
..
2d4ec15
100644
(file)
--- a/
include/linux/xfrm.h
+++ b/
include/linux/xfrm.h
@@
-58,7
+58,7
@@
struct xfrm_selector
__u8 prefixlen_s;
__u8 proto;
int ifindex;
-
uid_t
user;
+
__kernel_uid32_t
user;
};
#define XFRM_INF (~(__u64)0)