Skip to contentSkip to conversation

9p: socket and fd transport changes

PATCH In review Latchesar Ionkov 1 participant 1 message Nov 2, 2007

Subsystems (2)
lore
Share & tools
lore

Latchesar Ionkov

author maintainer
#0 lore raw

PATCH 3/10 9p: socket and fd transport changes

This patch ports the socket/file descriptor transport to the new transport interface.

---
 net/9p/Kconfig    |   18 +-
 net/9p/Makefile   |    2 +-
 net/9p/mux.c      | 1545 ++++++++++++++++++++++++++++-------------------------
 net/9p/trans_fd.c |  473 ----------------
 4 files changed, 832 insertions(+), 1206 deletions(-)
net/9p/Kconfig +9 -9
index d70cb87..bafc50c 100644
@@ -13,15 +13,15 @@ menuconfig NET_9P
 
 	  If unsure, say N.
 
-#config NET_9P_FD
-#	depends on NET_9P
-#	default y if NET_9P
-#	tristate "9P File Descriptor Transports (Experimental)"
-#	help
-#	  This builds support for file descriptor transports for 9p
-#	  which includes support for TCP/IP, named pipes, or passed
-#	  file descriptors.  TCP/IP is the default transport for 9p,
-#	  so if you are going to use 9p, you'll likely want this.
+config NET_9P_FD
+	depends on NET_9P
+	default y if NET_9P
+	tristate "9P File Descriptor Transports (Experimental)"
+	help
+	  This builds support for file descriptor transports for 9p
+	  which includes support for TCP/IP, named pipes, or passed
+	  file descriptors.  TCP/IP is the default transport for 9p,
+	  so if you are going to use 9p, you'll likely want this.
 
 config NET_9P_VIRTIO
 	depends on NET_9P && EXPERIMENTAL && VIRTIO
net/9p/Makefile +1 -1
index 8a10511..87c0fa5 100644
@@ -11,7 +11,7 @@ obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o
 	util.o \
 
 9pnet_fd-objs := \
-	trans_fd.o \
+	mux.o \
 
 9pnet_virtio-objs := \
 	trans_virtio.o \
net/9p/mux.c +822 -723

1,856 lines not on this page · raw message

net/9p/trans_fd.c deleted +0 -473

473 lines not on this page · raw message