Skip to contentSkip to conversation

Move usbnet.h and rndis_host.h to include/linux/usb

PATCH In review Jussi Kivilinna 1 participant 1 message Jan 20, 2008

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 12/14 Move usbnet.h and rndis_host.h to include/linux/usb

Move headers usbnet.h and rndis_host.h to include/linux/usb and fix includes for drivers/net/usb modules. Headers are moved because rndis_wext will be outside drivers/net/usb in drivers/net/wireless and yet need these headers.

---

 drivers/net/usb/asix.c         |    3 
 drivers/net/usb/cdc_ether.c    |    3 
 drivers/net/usb/cdc_subset.c   |    3 
 drivers/net/usb/dm9601.c       |    3 
 drivers/net/usb/gl620a.c       |    3 
 drivers/net/usb/mcs7830.c      |    3 
 drivers/net/usb/net1080.c      |    3 
 drivers/net/usb/plusb.c        |    3 
 drivers/net/usb/rndis_host.c   |    5 -
 drivers/net/usb/rndis_host.h   |  257 ----------------------------------------
 drivers/net/usb/usbnet.c       |    3 
 drivers/net/usb/usbnet.h       |  211 ---------------------------------
 drivers/net/usb/zaurus.c       |    3 
 include/linux/usb/rndis_host.h |  257 ++++++++++++++++++++++++++++++++++++++++
 include/linux/usb/usbnet.h     |  211 +++++++++++++++++++++++++++++++++
 15 files changed, 480 insertions(+), 491 deletions(-)
drivers/net/usb/asix.c +1 -2
index 569028b..6f245cf 100644
@@ -33,8 +33,7 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 #define DRIVER_VERSION "14-Jun-2006"
 static const char driver_name [] = "asix";
drivers/net/usb/cdc_ether.c +1 -2
index 97c17bb..a934428 100644
@@ -31,8 +31,7 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 #if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
drivers/net/usb/cdc_subset.c +1 -2
index 943988e..0ec7936 100644
@@ -26,8 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /*
drivers/net/usb/dm9601.c +1 -2
index 1ffdd10..5a4e40c 100644
@@ -20,8 +20,7 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 /* datasheet:
  http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf
drivers/net/usb/gl620a.c +1 -2
index 031cf5c..f7ccfad 100644
@@ -29,8 +29,7 @@
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /*
drivers/net/usb/mcs7830.c +1 -2
index 5ea7411..c3d119f 100644
@@ -31,8 +31,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 /* requests */
 #define MCS7830_RD_BMREQ	(USB_DIR_IN  | USB_TYPE_VENDOR | \
drivers/net/usb/net1080.c +1 -2
index 19bf8da..034e8a7 100644
@@ -28,11 +28,10 @@
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
+#include <linux/usb/usbnet.h>
 
 #include <asm/unaligned.h>
 
-#include "usbnet.h"
-
 
 /*
  * Netchip 1080 driver ... http://www.netchip.com
drivers/net/usb/plusb.c +1 -2
index 4530093..08555f8 100644
@@ -28,8 +28,7 @@
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /*
drivers/net/usb/rndis_host.c +2 -3
index c295fa1..1ffbbb3 100644
@@ -29,9 +29,8 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
-
-#include "usbnet.h"
-#include "rndis_host.h"
+#include <linux/usb/usbnet.h>
+#include <linux/usb/rndis_host.h>
 
 
 /*
drivers/net/usb/rndis_host.h deleted +0 -257

257 lines not on this page · raw message

drivers/net/usb/usbnet.c +1 -2
index a2a2d5e..8463efb 100644
@@ -41,8 +41,7 @@
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 #define DRIVER_VERSION		"22-Aug-2005"
 
drivers/net/usb/usbnet.h deleted +0 -211

211 lines not on this page · raw message

drivers/net/usb/zaurus.c +1 -2
index 9f98e8c..e24f7b3 100644
@@ -29,8 +29,7 @@
 #include <linux/crc32.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /*
include/linux/usb/rndis_host.h new file +257 -0

257 lines not on this page · raw message

include/linux/usb/usbnet.h new file +211 -0

211 lines not on this page · raw message