From c372d71ace6407209aba2d4caf5949b436a93c86 Mon Sep 17 00:00:00 2001
From: Himanshu Chauhan <himanshu@symmetricore.com>
Date: Sat, 23 Jan 2010 10:36:56 +0530
Subject: [PATCH] --- yaml --- r: 186719 b: refs/heads/master c:
 a439f5bff51d3e0c93d61ee6886b9dbf29a03da9 h: refs/heads/master i:   186717:
 4845240f1dfc2efe9890e58d500736a3e45eda01   186715:
 0fdb368f8ccf21275ee9c5d0377399871763c797   186711:
 a33c36565e763c521cb362965219bb8e70214dd9   186703:
 dff71c7a62b5902a751ce6b01f3b4d4a609aecfc   186687:
 faeced9e35713de9ea56143d4d1448afec01ca9e v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/usbip/usbip_common.c | 54 ----------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/[refs] b/[refs]
index 36f9e317cee2..29dd248439ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aad86577b829be29048e0a692e1c28c3ffeda6ca
+refs/heads/master: a439f5bff51d3e0c93d61ee6886b9dbf29a03da9
diff --git a/trunk/drivers/staging/usbip/usbip_common.c b/trunk/drivers/staging/usbip/usbip_common.c
index 3367a5217694..d8197028f20a 100644
--- a/trunk/drivers/staging/usbip/usbip_common.c
+++ b/trunk/drivers/staging/usbip/usbip_common.c
@@ -530,60 +530,6 @@ int usbip_xmit(int send, struct socket *sock, char *buf,
 }
 EXPORT_SYMBOL_GPL(usbip_xmit);
 
-
-/* now a usrland utility should set options. */
-#if 0
-int setquickack(struct socket *socket)
-{
-	mm_segment_t oldfs;
-	int val = 1;
-	int ret;
-
-	oldfs = get_fs();
-	set_fs(get_ds());
-	ret = socket->ops->setsockopt(socket, SOL_TCP, TCP_QUICKACK,
-			(char __user *) &val, sizeof(ret));
-	set_fs(oldfs);
-
-	return ret;
-}
-
-int setnodelay(struct socket *socket)
-{
-	mm_segment_t oldfs;
-	int val = 1;
-	int ret;
-
-	oldfs = get_fs();
-	set_fs(get_ds());
-	ret = socket->ops->setsockopt(socket, SOL_TCP, TCP_NODELAY,
-			(char __user *) &val, sizeof(ret));
-	set_fs(oldfs);
-
-	return ret;
-}
-
-int setkeepalive(struct socket *socket)
-{
-	mm_segment_t oldfs;
-	int val = 1;
-	int ret;
-
-	oldfs = get_fs();
-	set_fs(get_ds());
-	ret = socket->ops->setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE,
-			(char __user *) &val, sizeof(ret));
-	set_fs(oldfs);
-
-	return ret;
-}
-
-void setreuse(struct socket *socket)
-{
-	socket->sk->sk_reuse = 1;
-}
-#endif
-
 struct socket *sockfd_to_socket(unsigned int sockfd)
 {
 	struct socket *socket;