Преглед на файлове

Merge pull request #149 from skilau/Fix_Workaround_Issue_145

Fix (workaround) for issue #145.
gtxaspec преди 3 години
родител
ревизия
f1c0e3725e
променени са 2 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 4 0
      README.md
  2. 2 2
      SD_ROOT/wz_mini/etc/init.d/wz_user.sh

+ 4 - 0
README.md

@@ -161,6 +161,10 @@ To have the Ethernet NIC be auto-detected and loaded automatically, set the ENAB
 To load a specific USB Ethernet NIC driver, set ENABLE_USB_ETH_MODULE_MANUAL to one of the following:
 asix, ax88179_178a, cdc_ether, r8152
 
+NOTE: There is a possibility of a conflict between Ethernet NIC adapters that report themselves as PCI ID '0bda:8152'.  (Realtek 8152 and CDC Ethernet)
+Since the 8152 is Realtek's product, that driver will be the one used for products that report that PCI ID.
+If you happen to have a CDC Ethernet product that uses that specific PCI ID, please set the ENABLE_USB_ETH_MODULE_AUTODETECT option to false, and set ENABLE_USB_ETH_MODULE_MANUAL to "cdc_ether"
+
 The next time you boot your camera, make sure your USB Ethernet Adapter is connected to the camera and ethernet. The camera has to be setup initially with Wi-Fi for this to work.  After setup, Wi-Fi is no longer needed, as long as you are using the USB Ethernet Adapter.  Note that using USB Ethernet disables the onboard Wi-Fi.
 
 ---

+ 2 - 2
SD_ROOT/wz_mini/etc/init.d/wz_user.sh

@@ -320,7 +320,7 @@ if [[ "$ENABLE_USB_ETH" == "true" ]]; then
 				modprobe ax88179_178a
 				;;
 			'1004:61aa' | '046d:c11f' | '1410:b001' | '1410:9010' | '413c:8195' |\
-			'413c:8196' | '413c:819b' | '16d5:650a' | '12d1:14ac' | '0bda:8152')
+			'413c:8196' | '413c:819b' | '16d5:650a' | '12d1:14ac')
 				echo "Loading USB CDC Ethernet driver..."
 				modprobe cdc_ether
 				;;
@@ -334,7 +334,7 @@ if [[ "$ENABLE_USB_ETH" == "true" ]]; then
 
 	# Manually load any other Ethernet Drivers if asked for
 	if [[ "$ENABLE_USB_ETH_MODULE_MANUAL" != "" ]]; then
-		for i in $(echo "$ENABLE_USB_ETH_MODULES" | tr "," "\n")
+		for i in $(echo "$ENABLE_USB_ETH_MODULE_MANUAL" | tr "," "\n")
 		do
 			insmod $KMOD_PATH/kernel/drivers/net/usb/$i.ko
 		done