Quote:
|
Originally Posted by hdp
The patch is attached, and it needs to be applied to os/linux/sta_ioctl.c
After applying that make sure you follow the instructions in the readme, then it should compile and install cleanly.
|
HDP:
I read your patch to see what you did, and see the fix is trivial, and pretty much exactly what the warnings/errors tell me. I added "info" to the functions to make it work like you did.
One thing about the patch, it does not apply cleanly, so after applying, on the resulting file on line (aprox) 1380 I simply added "info" as the first parameter, and it compiled clean.
Here is a log of my console for those who might like to read an example of how it should work:
[root@localhost linux]# patch sta_ioctl.c sta_ioctl.patch
patching file sta_ioctl.c
Hunk #1 succeeded at 243 with fuzz 2 (offset 33 lines).
Hunk #2 succeeded at 1172 (offset 97 lines).
Hunk #3 succeeded at 1124 (offset 33 lines).
Hunk #4 succeeded at 1215 (offset 97 lines).
Hunk #5 succeeded at 1171 (offset 33 lines).
Hunk #6 succeeded at 1250 (offset 97 lines).
Hunk #7 succeeded at 1204 (offset 33 lines).
Hunk #8 succeeded at 1296 (offset 97 lines).
Hunk #9 FAILED at 1320.
Hunk #10 FAILED at 1338.
Hunk #11 succeeded at 1259 with fuzz 2 (offset -3 lines).
misordered hunks! output would be garbled
Hunk #12 FAILED at 1359.
3 out of 12 hunks FAILED -- saving rejects to file sta_ioctl.c.rej
[root@localhost 2008_0325_RT2860_Linux_STA_v1.6.1.0]# vi os/linux/sta_ioctl.c
[root@localhost 2008_0325_RT2860_Linux_STA_v1.6.1.0]# make
make -C tools
make[1]: Entering directory
`/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/tools'
gcc -g bin2h.c -o bin2h
make[1]: Leaving directory
`/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/tools'
/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/tools/bin2h
cp -f os/linux/Makefile.6
/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/Makefile
make -C /lib/modules/2.6.25.11-97.fc9.i686/build
SUBDIRS=/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux
modules
make[1]: Entering directory `/usr/src/kernels/2.6.25.11-97.fc9.i686'
CC [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/../../common/rtmp_init.o
CC [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/../../os/linux/sta_ioctl.o
CC [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/../../common/2860_rtmp_init.o
CC [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/../../os/linux/2860_main_dev.o
CC [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/../../common/cmm_data_2860.o
LD [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/rt2860sta.o
Building modules, stage 2.
MODPOST 1 modules
CC /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/rt2860sta.mod.o
LD [M] /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/rt2860sta.ko
make[1]: Leaving directory `/usr/src/kernels/2.6.25.11-97.fc9.i686'
cp -f /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux/rt2860sta.ko
/tftpboot
[root@localhost 2008_0325_RT2860_Linux_STA_v1.6.1.0]# make install
make -C /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux
-f Makefile.6 install
make[1]: Entering directory
`/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux'
rm -rf /etc/Wireless/RT2860STA
mkdir /etc/Wireless/RT2860STA
cp /home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/RT2860STA.dat
/etc/Wireless/RT2860STA/.
install -d /lib/modules/2.6.25.11-97.fc9.i686/kernel/drivers/net/wireless/
install -m 644 -c rt2860sta.ko
/lib/modules/2.6.25.11-97.fc9.i686/kernel/drivers/net/wireless/
/sbin/depmod -a 2.6.25.11-97.fc9.i686
make[1]: Leaving directory
`/home/diz/build/2008_0325_RT2860_Linux_STA_v1.6.1.0/os/linux'