From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 24 Jul 2006 07:10:13 +0000 (+0000)
Subject: fix broadcom-wl patchtable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=804cd6088ad9d554d88dbd6b734196867b9bd528;p=openwrt%2Fsvn-archive%2Farchive.git

fix broadcom-wl patchtable

SVN-Revision: 4247
---

diff --git a/openwrt/package/broadcom-wl/Makefile b/openwrt/package/broadcom-wl/Makefile
index e6f322f4c6..068979a2ee 100644
--- a/openwrt/package/broadcom-wl/Makefile
+++ b/openwrt/package/broadcom-wl/Makefile
@@ -96,7 +96,7 @@ define wl_template
 	install -d -m0755 $(1)/etc/modules.d
 	echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
 	install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-	install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(1)/lib/modules/$(LINUX_VERSION)/
+	install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/
 endef
 
 define Package/kmod-brcm-wl/install
diff --git a/openwrt/package/broadcom-wl/src/kmod/Makefile b/openwrt/package/broadcom-wl/src/kmod/Makefile
index 9a7cb89818..ec33d8b673 100644
--- a/openwrt/package/broadcom-wl/src/kmod/Makefile
+++ b/openwrt/package/broadcom-wl/src/kmod/Makefile
@@ -13,7 +13,7 @@
 
 EXTRA_CFLAGS += -I$(TOPDIR)/arch/mips/bcm947xx/include -DBCMDRIVER
 
-O_TARGET	:= wl_link$(MOD_NAME).o
+O_TARGET	:= wl$(MOD_NAME).o
 
 obj-y		:= wl_mod$(MOD_NAME).o
 obj-y		+= bcmutils.o hnddma.o linux_osl.o
@@ -23,10 +23,9 @@ obj-m		:= $(O_TARGET)
 wl_mod$(MOD_NAME).o: wl_apsta$(MOD_NAME).o
 	sed -e 's,eth%d,wl%d\x00,g' < $< > $@
 
-wl$(MOD_NAME).o: wl_link$(MOD_NAME).o
-	$(OBJDUMP) -d $< | perl patchtable.pl > patchtable.bin
-	cat wl_link$(MOD_NAME).o patchtable.bin > $@
+wl$(MOD_NAME).o.patch: wl$(MOD_NAME).o
+	$(OBJDUMP) -d $< | perl patchtable.pl > $@
 
-modules: wl$(MOD_NAME).o
+modules: wl$(MOD_NAME).o.patch
 
 include $(TOPDIR)/Rules.make
diff --git a/openwrt/package/broadcom-wl/src/wlc/wlc.c b/openwrt/package/broadcom-wl/src/wlc/wlc.c
index 99237c095a..76096df5ce 100644
--- a/openwrt/package/broadcom-wl/src/wlc/wlc.c
+++ b/openwrt/package/broadcom-wl/src/wlc/wlc.c
@@ -128,7 +128,7 @@ static int ptable_init(void)
 	if (ptable[0] == PTABLE_MAGIC)
 		return 0;
 	
-	glob("/lib/modules/2.4.*/wl.o", 0, NULL, &globbuf);
+	glob("/lib/modules/2.4.*/wl.o.patch", 0, NULL, &globbuf);
 	
 	if (globbuf.gl_pathv[0] == NULL)
 		return -1;
@@ -139,13 +139,8 @@ static int ptable_init(void)
 	if (fstat(fd, &statbuf) < 0)
 		goto failed;
 
-	if (statbuf.st_size <= 512)
+	if (statbuf.st_size < 512)
 		goto failed;
-	
-	if (lseek(fd, statbuf.st_size - 512, SEEK_SET) < 0) {
-		perror("lseek");
-		goto failed;
-	}
 
 	if (read(fd, ptable, 512) < 512)
 		goto failed;