---

yaml --- r: 167531 b: refs/heads/master c: 5fdb997 h: refs/heads/master i: 167529: 72ddbd6 167527: 61c9960 v: v3
git-mirror · Oct 12, 2009 · 3ff53b3 · 3ff53b3
1 parent cdd9b42
commit 3ff53b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f7e35f8b7fc2f5620a863ac613bcf3080cb6ba
+refs/heads/master: 5fdb9973c10c2d2e046da0976782ece25e78dc8b
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -226,12 +226,12 @@ struct sock {
 #define sk_prot			__sk_common.skc_prot
 #define sk_net			__sk_common.skc_net
 	kmemcheck_bitfield_begin(flags);
-	unsigned char		sk_shutdown : 2,
-				sk_no_check : 2,
-				sk_userlocks : 4;
+	unsigned int		sk_shutdown  : 2,
+				sk_no_check  : 2,
+				sk_userlocks : 4,
+				sk_protocol  : 8,
+				sk_type      : 16;
 	kmemcheck_bitfield_end(flags);
-	unsigned char		sk_protocol;
-	unsigned short		sk_type;
 	int			sk_rcvbuf;
 	socket_lock_t		sk_lock;
 	/*