projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6]
/
include
/
linux
/
if_pppol2tp.h
diff --git
a/include/linux/if_pppol2tp.h
b/include/linux/if_pppol2tp.h
index
c7a6688
..
3a14b08
100644
(file)
--- a/
include/linux/if_pppol2tp.h
+++ b/
include/linux/if_pppol2tp.h
@@
-26,7
+26,7
@@
*/
struct pppol2tp_addr
{
-
pid_t pid;
/* pid that owns the fd.
+
__kernel_pid_t pid;
/* pid that owns the fd.
* 0 => current */
int fd; /* FD of UDP socket to use */