netdev - [PATCH] cdc-subset: make compile with all config options

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 30 Jul 2014 10:54:46 +0200
From:	Oliver Neukum <oneukum@...e.de>
To:	davem@...emloft.net, netdev@...r.kernel.org
Cc:	Oliver Neukum <oneukum@...e.de>
Subject: [PATCH] cdc-subset: make compile with all config options

My earlier patch introduced helper methods errornously
subject to conditional compilation. This patch makes them
available under all config options.

Signed-off-by: Oliver Neukum <oneukum@...e.de>
---
 drivers/net/usb/cdc_subset.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index 3ef411e..6ea98cf 100644
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -99,16 +99,6 @@ static void m5632_recover(struct usbnet *dev)
 	usb_unlock_device(udev);
 }
 
-static int dummy_prereset(struct usb_interface *intf)
-{
-	return 0;
-}
-
-static int dummy_postreset(struct usb_interface *intf)
-{
-	return 0;
-}
-
 static const struct driver_info	ali_m5632_info = {
 	.description =	"ALi M5632",
 	.flags       = FLAG_POINTTOPOINT,
@@ -117,7 +107,6 @@ static const struct driver_info	ali_m5632_info = {
 
 #endif
 
-.
 #ifdef	CONFIG_USB_AN2720
 #define	HAVE_HARDWARE
 
@@ -351,6 +340,15 @@ static const struct usb_device_id	products [] = {
 MODULE_DEVICE_TABLE(usb, products);
 
 /*-------------------------------------------------------------------------*/
+static int dummy_prereset(struct usb_interface *intf)
+{
+        return 0;
+}
+
+static int dummy_postreset(struct usb_interface *intf)
+{
+        return 0;
+}
 
 static struct usb_driver cdc_subset_driver = {
 	.name =		"cdc_subset",
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html