Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2009-09-28 23:17:49 +02:00
2 changed files with 79 additions and 79 deletions

View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2009-06-17
VER = 2009-05-30
THISAPP = compat-wireless-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9aeba3a4c19cbfb87df45a304ba7d5ba
$(DL_FILE)_MD5 = 1f3924b3bf450713a88422e63c7481a3
install : $(TARGET)
@@ -80,9 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Xen
ifeq "$(XEN)" "1"
# some dirty hacks that it is building
mv /usr/src/linux/include/linux/tracepoint.h /usr/src/linux/include/linux/tracepoint.h.xen
touch /usr/src/linux/include/linux/tracepoint.h
cd /usr/src/ && patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-1.patch
# mv /usr/src/linux/include/linux/tracepoint.h /usr/src/linux/include/linux/tracepoint.h.xen
# touch /usr/src/linux/include/linux/tracepoint.h
# cd /usr/src/ && patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-1.patch
endif
# Apply some wlan-card patches
@@ -111,8 +111,8 @@ endif
# Xen
ifeq "$(XEN)" "1"
# remove dirty hacks. restores to the status before the dirty hacks
cd /usr/src/ && patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-2.patch
mv /usr/src/linux/include/linux/tracepoint.h.xen /usr/src/linux/include/linux/tracepoint.h
# cd /usr/src/ && patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-2.patch
# mv /usr/src/linux/include/linux/tracepoint.h.xen /usr/src/linux/include/linux/tracepoint.h
endif
# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)

View File

@@ -1573,24 +1573,24 @@
########################################################
# Wireless Networking
########################################################
patches.suse/wireless-no-aes-select
patches.fixes/ipw2200-send-noassoc.patch
patches.fixes/iwl3945-fix-rfkill.patch
patches.fixes/iwlagn-fix-rfkill.patch
patches.fixes/iwlagn-fix-error-path.patch
patches.fixes/iwlwifi-fix-rs_get_rate-oops.patch
patches.fixes/iwlwifi-dont-clean-static-wep-keys.patch
patches.fixes/iwl3945-fix-crash-on-rmmod.patch
patches.fixes/ath5k-ignore-calibration-return-value.patch
patches.fixes/ath5k-aspire-one-led.patch
patches.fixes/rt2x00-fix-race-conditions.patch
patches.fixes/mac80211-add-direct-probe.patch
patches.fixes/b43legacy-fix-led_device_naming.diff
patches.fixes/iwlwifi-fix-iwl-3945_led_device_naming.diff
patches.fixes/iwlwifi-fix-iwl-led_device_naming.diff
patches.fixes/rt2x00-fix-led_device_naming.diff
patches.fixes/ath5k-5211-protected-fix.patch
patches.fixes/iwlwifi-fix-updating-key-flags.patch
# patches.suse/wireless-no-aes-select
# patches.fixes/ipw2200-send-noassoc.patch
# patches.fixes/iwl3945-fix-rfkill.patch
# patches.fixes/iwlagn-fix-rfkill.patch
# patches.fixes/iwlagn-fix-error-path.patch
# patches.fixes/iwlwifi-fix-rs_get_rate-oops.patch
# patches.fixes/iwlwifi-dont-clean-static-wep-keys.patch
# patches.fixes/iwl3945-fix-crash-on-rmmod.patch
# patches.fixes/ath5k-ignore-calibration-return-value.patch
# patches.fixes/ath5k-aspire-one-led.patch
# patches.fixes/rt2x00-fix-race-conditions.patch
# patches.fixes/mac80211-add-direct-probe.patch
# patches.fixes/b43legacy-fix-led_device_naming.diff
# patches.fixes/iwlwifi-fix-iwl-3945_led_device_naming.diff
# patches.fixes/iwlwifi-fix-iwl-led_device_naming.diff
# patches.fixes/rt2x00-fix-led_device_naming.diff
# patches.fixes/ath5k-5211-protected-fix.patch
# patches.fixes/iwlwifi-fix-updating-key-flags.patch
########################################################
# iSCSI
@@ -2088,62 +2088,62 @@
# Staging tree patches
# new drivers that are going upstream
########################################################
patches.drivers/0001-Staging-add-TAINT_CRAP-for-all-drivers-staging-code.patch
patches.drivers/0002-Staging-add-TAINT_CRAP-flag-to-drivers-staging-modu.patch
patches.drivers/0003-Staging-add-Kconfig-entries-and-Makefile-infrastruc.patch
patches.drivers/0004-Staging-add-MAINTAINERS-entry.patch
patches.drivers/0005-Staging-add-et131x-network-driver.patch
patches.drivers/0006-Staging-add-Alacritech-slicoss-network-driver.patch
patches.drivers/0007-Staging-add-sxg-network-driver.patch
patches.drivers/0008-Staging-add-me4000-firmware-files.patch
patches.drivers/0009-Staging-add-me4000-pci-data-collection-driver.patch
patches.drivers/0010-Staging-add-the-go7007-video-driver.patch
patches.drivers/0011-Staging-USB-IP-add-common-functions-needed.patch
patches.drivers/0012-Staging-USB-IP-add-client-driver.patch
patches.drivers/0013-Staging-USB-IP-add-host-driver.patch
patches.drivers/0014-Staging-add-w35und-wifi-driver.patch
patches.drivers/0015-Staging-add-wlan-ng-prism2-usb-driver.patch
patches.drivers/0016-Staging-add-echo-cancelation-module.patch
patches.drivers/0017-Staging-Fix-gcc-warnings-in-sxg.patch
patches.drivers/0018-Staging-go7007-v4l-fixes.patch
patches.drivers/0019-Staging-SLICOSS-lots-of-checkpatch-fixes.patch
patches.drivers/0020-Staging-SLICOSS-Fix-warnings-due-to-static-usage.patch
patches.drivers/0021-Staging-SLICOSS-Fix-remaining-type-names.patch
patches.drivers/0022-Staging-SLICOSS-Call-pci_release_regions-at-driver.patch
patches.drivers/0023-Staging-Lindent-sxg.c.patch
patches.drivers/staging-workaround-build-system-bug.patch
patches.drivers/staging-at76_usb-wireless-driver.patch
patches.drivers/staging-add-agnx-wireless-driver.patch
patches.drivers/staging-add-otus-atheros-wireless-network-driver.patch
patches.drivers/staging-add-rt2860-wireless-driver.patch
patches.drivers/staging-rt2860-enable-wpa_supplicant-support.patch
patches.drivers/staging-rt2860-sync-driver-up-with-2.6.30-version.patch
patches.drivers/staging-add-serverengines-benet-10gb-ethernet-driver.patch
patches.drivers/staging-add-rtl8187se-driver.patch
patches.drivers/staging-add-rt2870-wireless-driver.patch
patches.drivers/staging-add-rt3070-wireless-driver.patch
# patches.drivers/0001-Staging-add-TAINT_CRAP-for-all-drivers-staging-code.patch
# patches.drivers/0002-Staging-add-TAINT_CRAP-flag-to-drivers-staging-modu.patch
# patches.drivers/0003-Staging-add-Kconfig-entries-and-Makefile-infrastruc.patch
# patches.drivers/0004-Staging-add-MAINTAINERS-entry.patch
# patches.drivers/0005-Staging-add-et131x-network-driver.patch
# patches.drivers/0006-Staging-add-Alacritech-slicoss-network-driver.patch
# patches.drivers/0007-Staging-add-sxg-network-driver.patch
# patches.drivers/0008-Staging-add-me4000-firmware-files.patch
# patches.drivers/0009-Staging-add-me4000-pci-data-collection-driver.patch
# patches.drivers/0010-Staging-add-the-go7007-video-driver.patch
# patches.drivers/0011-Staging-USB-IP-add-common-functions-needed.patch
# patches.drivers/0012-Staging-USB-IP-add-client-driver.patch
# patches.drivers/0013-Staging-USB-IP-add-host-driver.patch
# patches.drivers/0014-Staging-add-w35und-wifi-driver.patch
# patches.drivers/0015-Staging-add-wlan-ng-prism2-usb-driver.patch
# patches.drivers/0016-Staging-add-echo-cancelation-module.patch
# patches.drivers/0017-Staging-Fix-gcc-warnings-in-sxg.patch
# patches.drivers/0018-Staging-go7007-v4l-fixes.patch
# patches.drivers/0019-Staging-SLICOSS-lots-of-checkpatch-fixes.patch
# patches.drivers/0020-Staging-SLICOSS-Fix-warnings-due-to-static-usage.patch
# patches.drivers/0021-Staging-SLICOSS-Fix-remaining-type-names.patch
# patches.drivers/0022-Staging-SLICOSS-Call-pci_release_regions-at-driver.patch
# patches.drivers/0023-Staging-Lindent-sxg.c.patch
# patches.drivers/staging-workaround-build-system-bug.patch
# patches.drivers/staging-at76_usb-wireless-driver.patch
# patches.drivers/staging-add-agnx-wireless-driver.patch
# patches.drivers/staging-add-otus-atheros-wireless-network-driver.patch
# patches.drivers/staging-add-rt2860-wireless-driver.patch
# patches.drivers/staging-rt2860-enable-wpa_supplicant-support.patch
# patches.drivers/staging-rt2860-sync-driver-up-with-2.6.30-version.patch
# patches.drivers/staging-add-serverengines-benet-10gb-ethernet-driver.patch
# patches.drivers/staging-add-rtl8187se-driver.patch
# patches.drivers/staging-add-rt2870-wireless-driver.patch
# patches.drivers/staging-add-rt3070-wireless-driver.patch
patches.drivers/staging-hv-add-the-hyper-v-api-header-files.patch
patches.drivers/staging-hv-add-the-hyper-v-driver-header-files.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-bus.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-storage-driver.patch
patches.drivers/staging-hv-add-a-todo-file.patch
patches.drivers/staging-hv-make-the-hyper-v-virtual-bus-code-build.patch
patches.drivers/staging-hv-use-the-correct-ifdef-for-x86-64.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-bus-to-the-build.patch
patches.drivers/staging-hv-make-the-hyper-v-virtual-storage-driver-build.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-scsi-driver-to-the-build.patch
patches.drivers/staging-hv-storvsc-fix-up-driver_data-usage.patch
patches.drivers/staging-hv-make-the-hyper-v-virtual-block-driver-build.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver-to-the-build.patch
patches.drivers/staging-hv-blkvsc-fix-up-driver_data-usage.patch
patches.drivers/staging-hv-make-the-hyper-v-virtual-network-driver-build.patch
patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver-to-the-build.patch
# patches.drivers/staging-hv-add-the-hyper-v-api-header-files.patch
# patches.drivers/staging-hv-add-the-hyper-v-driver-header-files.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-bus.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-storage-driver.patch
# patches.drivers/staging-hv-add-a-todo-file.patch
# patches.drivers/staging-hv-make-the-hyper-v-virtual-bus-code-build.patch
# patches.drivers/staging-hv-use-the-correct-ifdef-for-x86-64.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-bus-to-the-build.patch
# patches.drivers/staging-hv-make-the-hyper-v-virtual-storage-driver-build.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-scsi-driver-to-the-build.patch
# patches.drivers/staging-hv-storvsc-fix-up-driver_data-usage.patch
# patches.drivers/staging-hv-make-the-hyper-v-virtual-block-driver-build.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver-to-the-build.patch
# patches.drivers/staging-hv-blkvsc-fix-up-driver_data-usage.patch
# patches.drivers/staging-hv-make-the-hyper-v-virtual-network-driver-build.patch
# patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver-to-the-build.patch
patches.drivers/staging-add-realtek-8192-pci-wireless-driver.patch
patches.drivers/staging-rtl8192e-backport-net_device_ops-conversion.patch
# patches.drivers/staging-add-realtek-8192-pci-wireless-driver.patch
# patches.drivers/staging-rtl8192e-backport-net_device_ops-conversion.patch
########################################################
# kernel-wide security fixes