git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
include
/
net
/
sock.h
diff --git
a/include/net/sock.h
b/include/net/sock.h
index
aab07e5
..
f6e3f99
100644
(file)
--- a/
include/net/sock.h
+++ b/
include/net/sock.h
@@
-116,9
+116,9
@@
struct sock_common {
unsigned int skc_hash;
struct proto *skc_prot;
xid_t skc_xid;
- struct vx_info *skc_vx_info;
+ struct vx_info
*skc_vx_info;
nid_t skc_nid;
- struct nx_info *skc_nx_info;
+ struct nx_info
*skc_nx_info;
};
/**