From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 15 Apr 2013 08:25:38 +0000 (+0200)
Subject: backports: add rndis_wlan usbnet requirements
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9cb352cd4c487990d742ee1869a9403c0afc6cc8;p=openwrt%2Fstaging%2Fblogic.git

backports: add rndis_wlan usbnet requirements

Apparently I missed this during the conversion to the new
copy-list etc. The rndis_wlan driver requires some usbnet
and rndis code, if that's not present then it is either
not selectable or can be compiled but won't link against
older kernels that don't have the right requirements (or
don't have the symbols exported.)

For now, because the makefile parser is stupid, patch out
the asix driver objects because otherwise it's possible
to select it and fail the build. Improving the parser is
possible but I need to finish other things first.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/backport/Kconfig b/backport/Kconfig
index 3103f1063915..2ee5064a0693 100644
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -31,6 +31,7 @@ source net/bluetooth/Kconfig
 source net/rfkill/Kconfig
 source drivers/net/wireless/Kconfig
 source drivers/net/ethernet/Kconfig
+source drivers/net/usb/Kconfig
 
 source drivers/ssb/Kconfig
 source drivers/bcma/Kconfig
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 096e80c2cda6..e2e2f4446a22 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -28,6 +28,7 @@ obj-$(CPTCFG_BT) += drivers/bluetooth/
 obj-$(CPTCFG_SSB) += drivers/ssb/
 obj-$(CPTCFG_BCMA) += drivers/bcma/
 obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
+obj-m += drivers/net/usb/
 obj-$(CPTCFG_DRM) += drivers/gpu/drm/
 obj-$(CPTCFG_NFC) += net/nfc/
 obj-$(CPTCFG_NFC) += drivers/nfc/
diff --git a/copy-list b/copy-list
index b49901d6eb9b..6db79a34c386 100644
--- a/copy-list
+++ b/copy-list
@@ -74,6 +74,12 @@ drivers/net/wireless/mac80211_hwsim.c
 drivers/net/wireless/mac80211_hwsim.h
 drivers/net/wireless/mwl8k.c
 drivers/net/wireless/rndis_wlan.c
+# rndis also requires some of the USB networking
+drivers/net/usb/Makefile
+drivers/net/usb/Kconfig
+drivers/net/usb/rndis_host.c
+drivers/net/usb/cdc_ether.c
+drivers/net/usb/usbnet.c
 
 
 # Bluetooth
diff --git a/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch
new file mode 100644
index 000000000000..d5dd1161eea0
--- /dev/null
+++ b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch
@@ -0,0 +1,10 @@
+--- a/drivers/net/usb/Makefile
++++ b/drivers/net/usb/Makefile
+@@ -8,7 +8,6 @@ obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
+ obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
+ obj-$(CONFIG_USB_HSO)		+= hso.o
+ obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
+-asix-y := asix_devices.o asix_common.o ax88172a.o
+ obj-$(CONFIG_USB_NET_AX88179_178A)      += ax88179_178a.o
+ obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o
+ obj-$(CONFIG_USB_NET_CDC_EEM)	+= cdc_eem.o