From 939db3b9de33cd23b34665246fee819765b1b519 Mon Sep 17 00:00:00 2001
From: Bart Westgeest <bart@elbrys.com>
Date: Mon, 19 Dec 2011 17:44:12 -0500
Subject: [PATCH] --- yaml --- r: 281426 b: refs/heads/master c:
 75fe8c8b906367ed3b3a5d87b4db42974e0dcf97 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/usbip/stub_dev.c     |  5 -----
 trunk/drivers/staging/usbip/usbip_common.h | 14 --------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index f258f30fb3b8..356744fa0ff6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a08c5267e45fe936452051a8c126e8418984eb7
+refs/heads/master: 75fe8c8b906367ed3b3a5d87b4db42974e0dcf97
diff --git a/trunk/drivers/staging/usbip/stub_dev.c b/trunk/drivers/staging/usbip/stub_dev.c
index 55c0b510889c..03420e25d9c6 100644
--- a/trunk/drivers/staging/usbip/stub_dev.c
+++ b/trunk/drivers/staging/usbip/stub_dev.c
@@ -109,11 +109,6 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
 			spin_unlock(&sdev->ud.lock);
 			return -EINVAL;
 		}
-#if 0
-		setnodelay(socket);
-		setkeepalive(socket);
-		setreuse(socket);
-#endif
 		sdev->ud.tcp_socket = socket;
 
 		spin_unlock(&sdev->ud.lock);
diff --git a/trunk/drivers/staging/usbip/usbip_common.h b/trunk/drivers/staging/usbip/usbip_common.h
index 33e8db0af9c5..b8f8c48b8a72 100644
--- a/trunk/drivers/staging/usbip/usbip_common.h
+++ b/trunk/drivers/staging/usbip/usbip_common.h
@@ -292,15 +292,6 @@ struct usbip_device {
 	} eh_ops;
 };
 
-#if 0
-int usbip_sendmsg(struct socket *, struct msghdr *, int);
-int set_sockaddr(struct socket *socket, struct sockaddr_storage *ss);
-int setnodelay(struct socket *);
-int setquickack(struct socket *);
-int setkeepalive(struct socket *socket);
-void setreuse(struct socket *);
-#endif
-
 /* usbip_common.c */
 void usbip_dump_urb(struct urb *purb);
 void usbip_dump_header(struct usbip_header *pdu);
@@ -336,9 +327,4 @@ static inline int interface_to_devnum(struct usb_interface *interface)
 	return udev->devnum;
 }
 
-static inline int interface_to_infnum(struct usb_interface *interface)
-{
-	return interface->cur_altsetting->desc.bInterfaceNumber;
-}
-
 #endif /* __USBIP_COMMON_H */