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 branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
[pandora-kernel.git]
/
include
/
linux
/
if_pppol2tp.h
diff --git
a/include/linux/if_pppol2tp.h
b/include/linux/if_pppol2tp.h
index
184bc55
..
23cefa1
100644
(file)
--- a/
include/linux/if_pppol2tp.h
+++ b/
include/linux/if_pppol2tp.h
@@
-39,7
+39,7
@@
struct pppol2tp_addr {
* bits. So we need a different sockaddr structure.
*/
struct pppol2tpv3_addr {
* bits. So we need a different sockaddr structure.
*/
struct pppol2tpv3_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 or IP socket to use */
* 0 => current */
int fd; /* FD of UDP or IP socket to use */