---

yaml --- r: 215152 b: refs/heads/master c: b3d6255 h: refs/heads/master v: v3
git-mirror · Oct 13, 2010 · 66a208a · 66a208a
1 parent baffe7a
commit 66a208a
Show file tree

Hide file tree

Showing 5 changed files with 216 additions and 192 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7368ddf144afd79456fd853fa25f33e31da003a9
+refs/heads/master: b3d6255388de0680a14f0907deb7b7f4fa0d25d5
diff --git a/trunk/include/linux/phonet.h b/trunk/include/linux/phonet.h
@@ -36,10 +36,9 @@
 /* Socket options for SOL_PNPIPE level */
 #define PNPIPE_ENCAP		1
 #define PNPIPE_IFINDEX		2
-#define PNPIPE_CREATE           3
+#define PNPIPE_PIPE_HANDLE	3
 #define PNPIPE_ENABLE           4
 /* unused slot */
-#define PNPIPE_DESTROY          6
 
 #define PNADDR_ANY		0
 #define PNADDR_BROADCAST	0xFC

diff --git a/trunk/include/net/phonet/pep.h b/trunk/include/net/phonet/pep.h
@@ -46,8 +46,8 @@ struct pep_sock {
 	u8			init_enable;	/* auto-enable at creation */
 	u8			aligned;
 #ifdef CONFIG_PHONET_PIPECTRLR
-	u16                     remote_pep;
-	u8                      pipe_state;
+	u8			pipe_state;
+	struct sockaddr_pn	remote_pep;
 #endif
 };