Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a30ad7 authored by Valentina Manea's avatar Valentina Manea Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: re-add interface information listing 



This was deleted in the driver conversion patch. It didn't need
to be deleted; showing more information is ok.

Signed-off-by: default avatarValentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: default avatarShuah Khan <shuah.kh@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37765c13

drivers/staging/usbip/userspace/src/usbip_list.c

+19 −1
Original line number Original line Diff line number Diff line
@@ -52,8 +52,9 @@ static int get_exported_devices(char *host, int sockfd) 
	struct op_devlist_reply reply;

	struct op_devlist_reply reply;

	uint16_t code = OP_REP_DEVLIST;

	uint16_t code = OP_REP_DEVLIST;

	struct usbip_usb_device udev;

	struct usbip_usb_device udev;

	struct usbip_usb_interface uintf;

	unsigned int i;

	unsigned int i;

	int rc;

	int rc, j;





	rc = usbip_net_send_op_common(sockfd, OP_REQ_DEVLIST, 0);

	rc = usbip_net_send_op_common(sockfd, OP_REQ_DEVLIST, 0);

	if (rc < 0) {

	if (rc < 0) {
@@ -103,6 +104,23 @@ static int get_exported_devices(char *host, int sockfd) 
		printf("%11s: %s\n", "", udev.path);

		printf("%11s: %s\n", "", udev.path);

		printf("%11s: %s\n", "", class_name);

		printf("%11s: %s\n", "", class_name);





		for (j = 0; j < udev.bNumInterfaces; j++) {

			rc = usbip_net_recv(sockfd, &uintf, sizeof(uintf));

			if (rc < 0) {

				err("usbip_net_recv failed: usbip_usb_intf[%d]",

						j);



				return -1;

			}

			usbip_net_pack_usb_interface(0, &uintf);



			usbip_names_get_class(class_name, sizeof(class_name),

					uintf.bInterfaceClass,

					uintf.bInterfaceSubClass,

					uintf.bInterfaceProtocol);

			printf("%11s: %2d - %s\n", "", j, class_name);

		}



		printf("\n");

		printf("\n");

	}

	}

drivers/staging/usbip/userspace/src/usbipd.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -159,8 +159,9 @@ static int send_reply_devlist(int connfd) 
{

{

	struct usbip_exported_device *edev;

	struct usbip_exported_device *edev;

	struct usbip_usb_device pdu_udev;

	struct usbip_usb_device pdu_udev;

	struct usbip_usb_interface pdu_uinf;

	struct op_devlist_reply reply;

	struct op_devlist_reply reply;

	int rc;

	int rc, i;





	reply.ndev = 0;

	reply.ndev = 0;

	/* number of exported devices */

	/* number of exported devices */
@@ -194,6 +195,19 @@ static int send_reply_devlist(int connfd) 
			dbg("usbip_net_send failed: pdu_udev");

			dbg("usbip_net_send failed: pdu_udev");

			return -1;

			return -1;

		}

		}



		for (i = 0; i < edev->udev.bNumInterfaces; i++) {

			dump_usb_interface(&edev->uinf[i]);

			memcpy(&pdu_uinf, &edev->uinf[i], sizeof(pdu_uinf));

			usbip_net_pack_usb_interface(1, &pdu_uinf);



			rc = usbip_net_send(connfd, &pdu_uinf,

					sizeof(pdu_uinf));

			if (rc < 0) {

				err("usbip_net_send failed: pdu_uinf");

				return -1;

			}

		}

	}

	}





	return 0;

	return 0;