Imported version 8.042

mtorromeo · May 13, 2016 · a86318c · a86318c
1 parent d23a369
commit a86318c
Show file tree

Hide file tree

Showing 10 changed files with 2,429 additions and 1,986 deletions.
diff --git a/autorun.sh b/autorun.sh
@@ -3,12 +3,15 @@
 # invoke insmod with all arguments we got
 # and use a pathname, as insmod doesn't look in . by default
 
-TARGET_PATH=$(find /lib/modules/$(uname -r)/kernel/drivers/net -name realtek -type d)
+TARGET_PATH=$(find /lib/modules/$(uname -r)/kernel/drivers/net/ethernet -name realtek -type d)
+if [ "$TARGET_PATH" = "" ]; then
+	TARGET_PATH=$(find /lib/modules/$(uname -r)/kernel/drivers/net -name realtek -type d)
+fi
 if [ "$TARGET_PATH" = "" ]; then
 	TARGET_PATH=/lib/modules/$(uname -r)/kernel/drivers/net
 fi
 echo
-echo "Check old driver and unload it." 
+echo "Check old driver and unload it."
 check=`lsmod | grep r8169`
 if [ "$check" != "" ]; then
         echo "rmmod r8169"

diff --git a/src/Makefile b/src/Makefile
@@ -65,7 +65,10 @@ else
 	BASEDIR := /lib/modules/$(shell uname -r)
 	KERNELDIR ?= $(BASEDIR)/build
 	PWD :=$(shell pwd)
-	DRIVERDIR := $(shell find $(BASEDIR)/kernel/drivers/net -name realtek -type d)
+	DRIVERDIR := $(shell find $(BASEDIR)/kernel/drivers/net/ethernet -name realtek -type d)
+	ifeq ($(DRIVERDIR),)
+		DRIVERDIR := $(shell find $(BASEDIR)/kernel/drivers/net -name realtek -type d)
+	endif
 	ifeq ($(DRIVERDIR),)
 		DRIVERDIR := $(BASEDIR)/kernel/drivers/net
 	endif