Commit 7104b5df authored by David Chang's avatar David Chang Committed by Greg Kroah-Hartman

staging: usbip: userspace: usbipd.c: fix userspace build error

When build userspace code, got the following error message:
make[2]: Entering directory `/usr/src/staging-2.6/drivers/staging/usbip/userspace/src'
  CC     usbip.o
...
  CCLD   usbip
  CC     usbipd.o
usbipd.c:30:25: fatal error: stub_driver.h: No such file or directory
compilation terminated.
make[2]: *** [usbipd.o] Error 1
make[2]: Leaving directory `/usr/src/staging-2.6/drivers/staging/usbip/userspace/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/src/staging-2.6/drivers/staging/usbip/userspace'
make: *** [all] Error 2

Due to commit 756d6726 and a16941ae, stub_driver had been changed
into host_driver, so update header filename and functions name to
fix these build errors
Signed-off-by: default avatarDavid Chang <dchang@novell.com>
CC: Joe Perches <joe@perches.com>
Cc: matt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e8e30b8d
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <glib.h> #include <glib.h>
#include <signal.h> #include <signal.h>
#include "stub_driver.h" #include "usbip_host_driver.h"
#include "usbip_common.h" #include "usbip_common.h"
#include "usbip_network.h" #include "usbip_network.h"
...@@ -43,7 +43,7 @@ static int send_reply_devlist(int sockfd) ...@@ -43,7 +43,7 @@ static int send_reply_devlist(int sockfd)
reply.ndev = 0; reply.ndev = 0;
/* how many devices are exported ? */ /* how many devices are exported ? */
dlist_for_each_data(stub_driver->edev_list, edev, struct usbip_exported_device) { dlist_for_each_data(host_driver->edev_list, edev, struct usbip_exported_device) {
reply.ndev += 1; reply.ndev += 1;
} }
...@@ -63,7 +63,7 @@ static int send_reply_devlist(int sockfd) ...@@ -63,7 +63,7 @@ static int send_reply_devlist(int sockfd)
return ret; return ret;
} }
dlist_for_each_data(stub_driver->edev_list, edev, struct usbip_exported_device) { dlist_for_each_data(host_driver->edev_list, edev, struct usbip_exported_device) {
struct usbip_usb_device pdu_udev; struct usbip_usb_device pdu_udev;
dump_usb_device(&edev->udev); dump_usb_device(&edev->udev);
...@@ -138,7 +138,7 @@ static int recv_request_import(int sockfd) ...@@ -138,7 +138,7 @@ static int recv_request_import(int sockfd)
PACK_OP_IMPORT_REQUEST(0, &req); PACK_OP_IMPORT_REQUEST(0, &req);
dlist_for_each_data(stub_driver->edev_list, edev, struct usbip_exported_device) { dlist_for_each_data(host_driver->edev_list, edev, struct usbip_exported_device) {
if (!strncmp(req.busid, edev->udev.busid, SYSFS_BUS_ID_SIZE)) { if (!strncmp(req.busid, edev->udev.busid, SYSFS_BUS_ID_SIZE)) {
dbg("found requested device %s", req.busid); dbg("found requested device %s", req.busid);
found = 1; found = 1;
...@@ -151,7 +151,7 @@ static int recv_request_import(int sockfd) ...@@ -151,7 +151,7 @@ static int recv_request_import(int sockfd)
usbip_set_nodelay(sockfd); usbip_set_nodelay(sockfd);
/* export_device needs a TCP/IP socket descriptor */ /* export_device needs a TCP/IP socket descriptor */
ret = usbip_stub_export_device(edev, sockfd); ret = usbip_host_export_device(edev, sockfd);
if (ret < 0) if (ret < 0)
error = 1; error = 1;
} else { } else {
...@@ -197,7 +197,7 @@ static int recv_pdu(int sockfd) ...@@ -197,7 +197,7 @@ static int recv_pdu(int sockfd)
} }
ret = usbip_stub_refresh_device_list(); ret = usbip_host_refresh_device_list();
if (ret < 0) if (ret < 0)
return -1; return -1;
...@@ -431,7 +431,7 @@ static void do_standalone_mode(gboolean daemonize) ...@@ -431,7 +431,7 @@ static void do_standalone_mode(gboolean daemonize)
if (ret) if (ret)
err("open usb.ids"); err("open usb.ids");
ret = usbip_stub_driver_open(); ret = usbip_host_driver_open();
if (ret < 0) if (ret < 0)
g_error("driver open failed"); g_error("driver open failed");
...@@ -471,7 +471,7 @@ static void do_standalone_mode(gboolean daemonize) ...@@ -471,7 +471,7 @@ static void do_standalone_mode(gboolean daemonize)
freeaddrinfo(ai_head); freeaddrinfo(ai_head);
usbip_names_free(); usbip_names_free();
usbip_stub_driver_close(); usbip_host_driver_close();
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment