Author: alexander Date: 2007-08-15 07:38:53 -0600 (Wed, 15 Aug 2007) New Revision: 2022
Added: trunk/packages/linux/config.rt2x00 trunk/packages/linux/rt2x00-fixes-1.patch trunk/packages/linux64/config.rt2x00 trunk/packages/linux64/rt2x00-fixes-1.patch Modified: trunk/packages/linux/Makefile trunk/packages/linux/config.x86 trunk/packages/linux64/Makefile trunk/packages/linux64/config.x86_64 trunk/packages/net-firmware/Makefile Log: Added rt2x00 and iwlwifi wireless drivers and the corresponding firmware. Enabled various network packet schedulers. Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2007-08-15 10:43:08 UTC (rev 2021) +++ trunk/packages/linux/Makefile 2007-08-15 13:38:53 UTC (rev 2022) @@ -12,6 +12,10 @@ URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1) SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7 +# Undoes some upstream changes that are needed for linux-2.6.23-rcX +# but break the build with 2.6.22 +PATCH2= rt2x00-fixes-1.patch + PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch FILE1= ati-driver-installer-8.38.6-x86.x86_64.run @@ -33,6 +37,22 @@ URL-$(FILE4)= http://us.download.nvidia.com/XFree86/Linux-x86/1.0-7185/$(FILE4) SHA-$(FILE4)= 35593bee1499aaa429d9572a0c49f2fd137d0d22 +DIR5= mac80211-9.0.4 +FILE5= $(DIR5).tgz +URL-$(FILE5)= http://intellinuxwireless.org/mac80211/downloads/$(FILE5) +SHA-$(FILE5)= c15acff74a7c736cdb997546083f1e34278c6387 + +DIR6= iwlwifi-1.0.0-1 +FILE6= $(DIR6).tgz +URL-$(FILE6)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE6) +SHA-$(FILE6)= 879a636b63cd1c8aebc8bc1a6205656b491107bb + +DIR7= rt2x00-cvs-2007081406 +FILE7= $(DIR7).tar.gz +# Originally from http://rt2x00.serialmonkey.com/rt2x00-cvs-daily.tar.gz +URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7) +SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b + # Targets include $(ROOT)/scripts/functions @@ -41,10 +61,12 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(PATCH1) +stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(PATCH1) $(std_build) compile-stage2: + tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel + tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel zcat ../$(PATCH1) | patch -Np1 patch -Np1 -i ../$(PATCH3) install -d /boot/isolinux @@ -60,6 +82,10 @@ for a in $(DIR2) $(DIR3) $(DIR4) ; do \ sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS) ; done mv *.tgz /drivers + tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \ + sed -i '/depmod/d' Makefile ; \ + patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \ + make KERNDIR=`pwd`/.. install cd .. ; ./debian-style-headers.sh $(DIR) clean: Added: trunk/packages/linux/config.rt2x00 =================================================================== --- trunk/packages/linux/config.rt2x00 (rev 0) +++ trunk/packages/linux/config.rt2x00 2007-08-15 13:38:53 UTC (rev 2022) @@ -0,0 +1,79 @@ +# rt2x00 configuration +# All configuration options can be enabled +# by setting the value to 'y'. To disable +# the option it should be set to 'n'. + +# +# RT2X00 generic support +# + +# Enable rt2x00 support +CONFIG_RT2X00=y +# Enable rt2x00 debug output +CONFIG_RT2X00_DEBUG=y +# Enable rt2x00 debugfs support +CONFIG_RT2X00_LIB_DEBUGFS=n +# Enable rt2x00 asm file creation +CONFIG_RT2X00_ASM=n + +# +# RT2X00 driver support +# +# Enable rt2400pci support +CONFIG_RT2400PCI=y +# Enable rt2400pci hardware button support (requires rfkill) +CONFIG_RT2400PCI_BUTTON=y + +# Enable rt2500pci support +CONFIG_RT2500PCI=y +# Enable rt2500pci hardware button support (requires rfkill) +CONFIG_RT2500PCI_BUTTON=y + +# Enable rt2500usb support +CONFIG_RT2500USB=y + +# Enable rt61pci support +CONFIG_RT61PCI=y +# Enable rt61pci hardware button support (requires rfkill) +CONFIG_RT61PCI_BUTTON=y + +# Enable rt73usb support +CONFIG_RT73USB=y + +# +# Dscape ieee80211 stack +# + +# Build dscape ieee80211 stack support +CONFIG_D80211=y +# Enable dscape ieee80211 debug output +CONFIG_D80211_DEBUG=y +# Enable dscape ieee80211 asm file creation +CONFIG_D80211_ASM=n + +# +# CRC-ITU-T support +# + +# Enable crc-itu-t support +CONFIG_CRC_ITU_T=y +# Enable crc-itu-t asm file creation +CONFIG_CRC_ITU_T_ASM=n + +# +# EEPROM 93Cx6 support +# + +# Enable eeprom_93Cx6 support +CONFIG_EEPROM_93CX6=y +# Enable eeprom asm file creation +CONFIG_EEPROM_93CX6_ASM=n + +# +# RFkill support +# + +# Enable rfkill support +CONFIG_RFKILL=y +# Enable rfkill asm file creation +CONFIG_RFKILL_ASM=n Modified: trunk/packages/linux/config.x86 =================================================================== --- trunk/packages/linux/config.x86 2007-08-15 10:43:08 UTC (rev 2021) +++ trunk/packages/linux/config.x86 2007-08-15 13:38:53 UTC (rev 2022) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.22.1 -# Wed Aug 1 18:31:58 2007 +# Linux kernel version: 2.6.22.2 +# Wed Aug 15 17:47:27 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -362,6 +362,8 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_ASK_IP_FIB_HASH is not set +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set @@ -377,9 +379,16 @@ # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set @@ -464,9 +473,56 @@ # # QoS and/or fair queueing # -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y CONFIG_NET_SCH_FIFO=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +# CONFIG_NET_CLS_RSVP6 is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_PEDIT=m +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_ESTIMATOR=y # # Network testing @@ -568,6 +624,7 @@ # Wireless # CONFIG_CFG80211=m +CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_MAC80211=m # CONFIG_MAC80211_DEBUG is not set @@ -1003,6 +1060,7 @@ # Network device support # CONFIG_NETDEVICES=y +# CONFIG_IFB is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set @@ -1202,6 +1260,10 @@ # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_IWLWIFI=y +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWL4965=m +CONFIG_IWL3945=m # # USB Network Adapters Added: trunk/packages/linux/rt2x00-fixes-1.patch =================================================================== --- trunk/packages/linux/rt2x00-fixes-1.patch (rev 0) +++ trunk/packages/linux/rt2x00-fixes-1.patch 2007-08-15 13:38:53 UTC (rev 2022) @@ -0,0 +1,16 @@ +--- rt2x00mac.c ++++ rt2x00mac.c +@@ -56,11 +56,11 @@ + skb_put(skb, size); + + if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) +- ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id, ++ ieee80211_ctstoself_get(rt2x00dev->hw, + frag_skb->data, frag_skb->len, control, + (struct ieee80211_cts *)(skb->data)); + else +- ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id, ++ ieee80211_rts_get(rt2x00dev->hw, + frag_skb->data, frag_skb->len, control, + (struct ieee80211_rts *)(skb->data)); + Modified: trunk/packages/linux64/Makefile =================================================================== --- trunk/packages/linux64/Makefile 2007-08-15 10:43:08 UTC (rev 2021) +++ trunk/packages/linux64/Makefile 2007-08-15 13:38:53 UTC (rev 2022) @@ -12,6 +12,10 @@ URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1) SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7 +# Undoes some upstream changes that are needed for linux-2.6.23-rcX +# but break the build with 2.6.22 +PATCH2= rt2x00-fixes-1.patch + PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch FILE1= ati-driver-installer-8.38.6-x86.x86_64.run @@ -33,6 +37,22 @@ URL-$(FILE4)= http://us.download.nvidia.com/XFree86/Linux-x86_64/1.0-7185/$(FILE4) SHA-$(FILE4)= ffe1eb012707d5bffbe39756be54cb687b4ef498 +DIR5= mac80211-9.0.4 +FILE5= $(DIR5).tgz +URL-$(FILE5)= http://intellinuxwireless.org/mac80211/downloads/$(FILE5) +SHA-$(FILE5)= c15acff74a7c736cdb997546083f1e34278c6387 + +DIR6= iwlwifi-1.0.0-1 +FILE6= $(DIR6).tgz +URL-$(FILE6)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE6) +SHA-$(FILE6)= 879a636b63cd1c8aebc8bc1a6205656b491107bb + +DIR7= rt2x00-cvs-2007081406 +FILE7= $(DIR7).tar.gz +# Originally from http://rt2x00.serialmonkey.com/rt2x00-cvs-daily.tar.gz +URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7) +SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b + # Targets include $(ROOT)/scripts/functions @@ -41,10 +61,12 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(PATCH1) +stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(PATCH1) $(std_build) compile-stage2: + tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel + tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel zcat ../$(PATCH1) | patch -Np1 patch -Np1 -i ../$(PATCH3) install -d /boot/isolinux @@ -62,6 +84,11 @@ for a in $(DIR2) $(DIR3) $(DIR4) ; do \ sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS)-64bit ; done mv *.tgz /drivers + tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \ + sed -i '/depmod/d' Makefile ; \ + patch -Np0 -i ../../$(PATCH2) ; \ + PATH=$$PATH:$(WD)/bin make KERNDIR=`pwd`/.. ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- ; \ + PATH=$$PATH:$(WD)/bin make KERNDIR=`pwd`/.. ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- install rm /lib/modules/*-64bit/{source,build} cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64 endif @@ -75,6 +102,10 @@ for a in $(DIR2) $(DIR3) $(DIR4) ; do \ sh ../$$a.run -x ; ../build-nvidia-driver.native $$a $(VRS)-64bit ; done mv *.tgz /drivers + tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \ + sed -i '/depmod/d' Makefile ; \ + patch -Np0 -i ../../$(PATCH2) ; \ + make KERNDIR=`pwd`/.. ; make KERNDIR=`pwd`/.. install cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux endif Added: trunk/packages/linux64/config.rt2x00 =================================================================== --- trunk/packages/linux64/config.rt2x00 (rev 0) +++ trunk/packages/linux64/config.rt2x00 2007-08-15 13:38:53 UTC (rev 2022) @@ -0,0 +1,79 @@ +# rt2x00 configuration +# All configuration options can be enabled +# by setting the value to 'y'. To disable +# the option it should be set to 'n'. + +# +# RT2X00 generic support +# + +# Enable rt2x00 support +CONFIG_RT2X00=y +# Enable rt2x00 debug output +CONFIG_RT2X00_DEBUG=y +# Enable rt2x00 debugfs support +CONFIG_RT2X00_LIB_DEBUGFS=n +# Enable rt2x00 asm file creation +CONFIG_RT2X00_ASM=n + +# +# RT2X00 driver support +# +# Enable rt2400pci support +CONFIG_RT2400PCI=y +# Enable rt2400pci hardware button support (requires rfkill) +CONFIG_RT2400PCI_BUTTON=y + +# Enable rt2500pci support +CONFIG_RT2500PCI=y +# Enable rt2500pci hardware button support (requires rfkill) +CONFIG_RT2500PCI_BUTTON=y + +# Enable rt2500usb support +CONFIG_RT2500USB=y + +# Enable rt61pci support +CONFIG_RT61PCI=y +# Enable rt61pci hardware button support (requires rfkill) +CONFIG_RT61PCI_BUTTON=y + +# Enable rt73usb support +CONFIG_RT73USB=y + +# +# Dscape ieee80211 stack +# + +# Build dscape ieee80211 stack support +CONFIG_D80211=y +# Enable dscape ieee80211 debug output +CONFIG_D80211_DEBUG=y +# Enable dscape ieee80211 asm file creation +CONFIG_D80211_ASM=n + +# +# CRC-ITU-T support +# + +# Enable crc-itu-t support +CONFIG_CRC_ITU_T=y +# Enable crc-itu-t asm file creation +CONFIG_CRC_ITU_T_ASM=n + +# +# EEPROM 93Cx6 support +# + +# Enable eeprom_93Cx6 support +CONFIG_EEPROM_93CX6=y +# Enable eeprom asm file creation +CONFIG_EEPROM_93CX6_ASM=n + +# +# RFkill support +# + +# Enable rfkill support +CONFIG_RFKILL=y +# Enable rfkill asm file creation +CONFIG_RFKILL_ASM=n Modified: trunk/packages/linux64/config.x86_64 =================================================================== --- trunk/packages/linux64/config.x86_64 2007-08-15 10:43:08 UTC (rev 2021) +++ trunk/packages/linux64/config.x86_64 2007-08-15 13:38:53 UTC (rev 2022) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.22.1 -# Sat Jul 21 16:08:05 2007 +# Linux kernel version: 2.6.22.2 +# Wed Aug 15 17:47:27 2007 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -303,6 +303,8 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_ASK_IP_FIB_HASH is not set +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set @@ -318,9 +320,16 @@ # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set @@ -447,9 +456,56 @@ # # QoS and/or fair queueing # -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y CONFIG_NET_SCH_FIFO=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +# CONFIG_NET_CLS_RSVP6 is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_PEDIT=m +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_ESTIMATOR=y # # Network testing @@ -550,6 +606,7 @@ # Wireless # CONFIG_CFG80211=m +CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y CONFIG_MAC80211=m # CONFIG_MAC80211_DEBUG is not set @@ -945,6 +1002,7 @@ # Network device support # CONFIG_NETDEVICES=y +# CONFIG_IFB is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set @@ -1111,6 +1169,10 @@ # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_IWLWIFI=y +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWL4965=m +CONFIG_IWL3945=m # # USB Network Adapters Added: trunk/packages/linux64/rt2x00-fixes-1.patch =================================================================== --- trunk/packages/linux64/rt2x00-fixes-1.patch (rev 0) +++ trunk/packages/linux64/rt2x00-fixes-1.patch 2007-08-15 13:38:53 UTC (rev 2022) @@ -0,0 +1,16 @@ +--- rt2x00mac.c ++++ rt2x00mac.c +@@ -56,11 +56,11 @@ + skb_put(skb, size); + + if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) +- ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id, ++ ieee80211_ctstoself_get(rt2x00dev->hw, + frag_skb->data, frag_skb->len, control, + (struct ieee80211_cts *)(skb->data)); + else +- ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id, ++ ieee80211_rts_get(rt2x00dev->hw, + frag_skb->data, frag_skb->len, control, + (struct ieee80211_rts *)(skb->data)); + Modified: trunk/packages/net-firmware/Makefile =================================================================== --- trunk/packages/net-firmware/Makefile 2007-08-15 10:43:08 UTC (rev 2021) +++ trunk/packages/net-firmware/Makefile 2007-08-15 13:38:53 UTC (rev 2022) @@ -72,6 +72,31 @@ URL-$(FILE15)= http://www.sigmatel.com/documents/$(FILE15) SHA-$(FILE15)= bee20b114e3f29c28819ec6a716472621bf6ac47 +DIR16= RT61_Firmware_V1.2 +FILE16= $(DIR16).zip +URL-$(FILE16)= http://www.ralinktech.com.tw/data/$(FILE16) +SHA-$(FILE16)= fded9f76ce620595b876b23b6a8c416af596dc5b + +DIR17= RT71W_Firmware_V1.8 +FILE17= $(DIR17).zip +URL-$(FILE17)= http://www.ralinktech.com.tw/data/$(FILE17) +SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e + +DIR18= iwlwifi-3945-ucode-2.14.1.5 +FILE18= $(DIR18).tgz +URL-$(FILE18)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE18) +SHA-$(FILE18)= aeeeccb2fddeff86ee7dbdca0f0d627d0c99d45c + +DIR19= iwlwifi-4965-ucode-4.44.1.18 +FILE19= $(DIR19).tgz +URL-$(FILE19)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE19) +SHA-$(FILE19)= 01bf0264cfc4f60957a7242264050a81c56858bf + +DIR20= iwlwifi-4965-ucode-4.44.17 +FILE20= $(DIR20).tgz +URL-$(FILE20)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE20) +SHA-$(FILE20)= 955d8718419dc2670d9b8167e22df118a36666a5 + ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE))) # Targets @@ -100,6 +125,11 @@ ./get_symbol_fw ; cp symbol_* /lib/firmware @cp $(FILE14) /lib/firmware/usb8388.bin @mkdir $(DIR15) ; cd $(DIR15) ; tar xf ../$(FILE15) ; install -m 644 *.sb /lib/firmware + @unzip $(FILE16) ; cp $(DIR16)/*.bin /lib/firmware + @unzip $(FILE17) ; cp $(DIR17)/*.bin /lib/firmware + @tar xf $(FILE18) ; cp $(DIR18)/* /lib/firmware + @tar xf $(FILE19) ; cp $(DIR19)/* /lib/firmware + @tar xf $(FILE20) ; cp $(DIR20)/* /lib/firmware @make clean @touch $@ -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
