From 6d162d9428a0d0b261628cd60bccb1115483eac1 Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Fri, 27 May 2011 01:44:12 -0700
Subject: [PATCH] --- yaml --- r: 259505 b: refs/heads/master c:
 3e4fda9f956d3e8f14e8cabc6dd4f1caa95981e4 h: refs/heads/master i:   259503:
 98ea7d7fe746089e42c8b0f11be9ad2f69972f73 v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/usbip/stub.h                 |  3 ++-
 .../staging/usbip/userspace/src/usbip_bind.c       | 14 ++++++++------
 trunk/drivers/staging/usbip/userspace/src/utils.c  |  8 ++++----
 trunk/drivers/staging/usbip/userspace/src/utils.h  |  3 ---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 9f4413e7c66e..c7df64155ee4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cbab52d18fc35e3c66f68e0382cd0815d31bb5f
+refs/heads/master: 3e4fda9f956d3e8f14e8cabc6dd4f1caa95981e4
diff --git a/trunk/drivers/staging/usbip/stub.h b/trunk/drivers/staging/usbip/stub.h
index 2cc596e81623..132adc57ebc1 100644
--- a/trunk/drivers/staging/usbip/stub.h
+++ b/trunk/drivers/staging/usbip/stub.h
@@ -76,7 +76,8 @@ struct stub_unlink {
 	__u32 status;
 };
 
-#define BUSID_SIZE 20
+/* same as SYSFS_BUS_ID_SIZE */
+#define BUSID_SIZE 32
 
 struct bus_id_priv {
 	char name[BUSID_SIZE];
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbip_bind.c b/trunk/drivers/staging/usbip/userspace/src/usbip_bind.c
index 9869db277cc0..978b7aa01852 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbip_bind.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbip_bind.c
@@ -57,7 +57,7 @@ static int unbind_interface_busid(char *busid)
 		return -1;
 	}
 
-	ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE));
+	ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
 	if (ret < 0) {
 		dbg("write to unbind_path failed: %d", ret);
 		close(fd);
@@ -71,10 +71,11 @@ static int unbind_interface_busid(char *busid)
 
 static int unbind_interface(char *busid, int configvalue, int interface)
 {
-	char inf_busid[BUS_ID_SIZE];
+	char inf_busid[SYSFS_BUS_ID_SIZE];
 	dbg("unbinding interface");
 
-	snprintf(inf_busid, BUS_ID_SIZE, "%s:%d.%d", busid, configvalue, interface);
+	snprintf(inf_busid, SYSFS_BUS_ID_SIZE, "%s:%d.%d", busid, configvalue,
+		 interface);
 
 	return unbind_interface_busid(inf_busid);
 }
@@ -148,7 +149,7 @@ static int bind_interface_busid(char *busid, char *driver)
 	if (fd < 0)
 		return -1;
 
-	ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE));
+	ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
 	if (ret < 0) {
 		close(fd);
 		return -1;
@@ -161,9 +162,10 @@ static int bind_interface_busid(char *busid, char *driver)
 
 static int bind_interface(char *busid, int configvalue, int interface, char *driver)
 {
-	char inf_busid[BUS_ID_SIZE];
+	char inf_busid[SYSFS_BUS_ID_SIZE];
 
-	snprintf(inf_busid, BUS_ID_SIZE, "%s:%d.%d", busid, configvalue, interface);
+	snprintf(inf_busid, SYSFS_BUS_ID_SIZE, "%s:%d.%d", busid, configvalue,
+		 interface);
 
 	return bind_interface_busid(inf_busid, driver);
 }
diff --git a/trunk/drivers/staging/usbip/userspace/src/utils.c b/trunk/drivers/staging/usbip/userspace/src/utils.c
index 6dbfdbd11d2b..1da1109d11d3 100644
--- a/trunk/drivers/staging/usbip/userspace/src/utils.c
+++ b/trunk/drivers/staging/usbip/userspace/src/utils.c
@@ -20,7 +20,7 @@ int modify_match_busid(char *busid, int add)
 {
 	int fd;
 	int ret;
-	char buff[BUS_ID_SIZE + 4];
+	char buff[SYSFS_BUS_ID_SIZE + 4];
 	char sysfs_mntpath[SYSFS_PATH_MAX];
 	char match_busid_path[SYSFS_PATH_MAX];
 
@@ -35,7 +35,7 @@ int modify_match_busid(char *busid, int add)
 		 SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME);
 
 	/* BUS_IS_SIZE includes NULL termination? */
-	if (strnlen(busid, BUS_ID_SIZE) > BUS_ID_SIZE - 1) {
+	if (strnlen(busid, SYSFS_BUS_ID_SIZE) > SYSFS_BUS_ID_SIZE - 1) {
 		dbg("busid is too long");
 		return -1;
 	}
@@ -45,9 +45,9 @@ int modify_match_busid(char *busid, int add)
 		return -1;
 
 	if (add)
-		snprintf(buff, BUS_ID_SIZE + 4, "add %s", busid);
+		snprintf(buff, SYSFS_BUS_ID_SIZE + 4, "add %s", busid);
 	else
-		snprintf(buff, BUS_ID_SIZE + 4, "del %s", busid);
+		snprintf(buff, SYSFS_BUS_ID_SIZE + 4, "del %s", busid);
 
 	dbg("write \"%s\" to %s", buff, match_busid_path);
 
diff --git a/trunk/drivers/staging/usbip/userspace/src/utils.h b/trunk/drivers/staging/usbip/userspace/src/utils.h
index 36ee8d5ba45a..b50e95a0a515 100644
--- a/trunk/drivers/staging/usbip/userspace/src/utils.h
+++ b/trunk/drivers/staging/usbip/userspace/src/utils.h
@@ -3,9 +3,6 @@
 
 #include <stdlib.h>
 
-/* Be sync to kernel header */
-#define BUS_ID_SIZE 20
-
 int modify_match_busid(char *busid, int add);
 int read_string(char *path, char *, size_t len);
 int read_integer(char *path);