Author: thl Update of /cvs/free/rpms/rt2860-kmod/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12584 Modified Files: .cvsignore sources Added Files: rt2860-2.6.25-iwe_stream-fix.diff rt2860-add-network-mgr-support.diff rt2860-dat-install-fixes.patch rt2860-kmod.spec rt2860-kmodtool-excludekernel-filterfile rt2860-net-namespace-separation.patch rt2860-remove-tftpboot-copy.patch Log Message: import from livna rt2860-2.6.25-iwe_stream-fix.diff: --- NEW FILE rt2860-2.6.25-iwe_stream-fix.diff --- diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/sta_ioctl.c 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/sta_ioctl.c --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/sta_ioctl.c 2008-07-04 01:01:00.000000000 -0500 +++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/sta_ioctl.c 2008-08-28 17:20:08.000000000 -0500 @@ -1073,7 +1073,7 @@ memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN); previous_ev = current_ev; - current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN); + current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_ADDR_LEN); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1089,7 +1089,7 @@ iwe.u.data.flags = 1; previous_ev = current_ev; - current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid); + current_ev = iwe_stream_add_point(info,current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1116,7 +1116,7 @@ iwe.len = IW_EV_UINT_LEN; previous_ev = current_ev; - current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN); + current_ev = iwe_stream_add_event(info,current_ev, end_buf, &iwe, IW_EV_UINT_LEN); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1136,7 +1136,7 @@ iwe.u.freq.i = 0; previous_ev = current_ev; - current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); + current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1151,7 +1151,7 @@ iwe.u.qual.level = 0; iwe.u.qual.noise = 0; set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi); - current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); + current_ev = iwe_stream_add_event(info,current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1169,7 +1169,7 @@ iwe.u.data.flags = IW_ENCODE_DISABLED; previous_ev = current_ev; - current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key); + current_ev = iwe_stream_add_point(info,current_ev, end_buf,&iwe, (char *)pAdapter->SharedKey[BSS0][(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1197,7 +1197,7 @@ iwe.u.bitrate.value = (tmpRate/2) * 1000000; iwe.u.bitrate.disabled = 0; - current_val = iwe_stream_add_value(current_ev, + current_val = iwe_stream_add_value(info,current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN); @@ -1221,7 +1221,7 @@ pAdapter->ScanTab.BssEntry[i].WpaIE.IELen); iwe.cmd = IWEVGENIE; iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].WpaIE.IELen; - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); + current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1239,7 +1239,7 @@ pAdapter->ScanTab.BssEntry[i].RsnIE.IELen); iwe.cmd = IWEVGENIE; iwe.u.data.length = pAdapter->ScanTab.BssEntry[i].RsnIE.IELen; - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); + current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1260,7 +1260,7 @@ for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].WpaIE.IELen; idx++) sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].WpaIE.IE[idx]); previous_ev = current_ev; - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); + current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; @@ -1280,7 +1280,7 @@ for (idx = 0; idx < pAdapter->ScanTab.BssEntry[i].RsnIE.IELen; idx++) sprintf(custom, "%s%02x", custom, pAdapter->ScanTab.BssEntry[i].RsnIE.IE[idx]); previous_ev = current_ev; - current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); + current_ev = iwe_stream_add_point(info,current_ev, end_buf, &iwe, custom); if (current_ev == previous_ev) #if WIRELESS_EXT >= 17 return -E2BIG; rt2860-add-network-mgr-support.diff: --- NEW FILE rt2860-add-network-mgr-support.diff --- diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/config.mk --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk 2008-07-07 09:37:50.000000000 -0500 +++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/config.mk 2008-08-28 17:54:07.000000000 -0500 @@ -5,10 +5,10 @@ HAS_28xx_QA=n # Support Wpa_Supplicant -HAS_WPA_SUPPLICANT=n +HAS_WPA_SUPPLICANT=y # Support Native WpaSupplicant for Network Maganger -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y #Support Net interface block while Tx-Sw queue full HAS_BLOCK_NET_IF=n rt2860-dat-install-fixes.patch: --- NEW FILE rt2860-dat-install-fixes.patch --- diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/Makefile.6 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/Makefile.6 --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/Makefile.6 2008-06-30 20:18:02.000000000 -0500 +++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/Makefile.6 2008-08-29 11:59:46.000000000 -0500 @@ -1,7 +1,7 @@ include $(RT28xx_DIR)/os/linux/config.mk MOD_NAME = rt$(CHIPSET)sta -DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA +DAT_PATH = $(DAT_PREFIX)/etc/Wireless/RT$(CHIPSET)STA DAT_FILE_NAME = RT$(CHIPSET)STA.dat obj-m := $(MOD_NAME).o @@ -75,15 +75,11 @@ rm -f ../../sta/.*.{cmd,flags,d} install: - rm -rf $(DAT_PATH) - $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless) - mkdir $(DAT_PATH) - cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/. + install -d $(DAT_PATH) + install -m 644 $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH) install -d $(LINUX_SRC_MODULE) install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} uninstall: # rm -rf $(DAT_PATH) rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) - /sbin/depmod -a ${shell uname -r} --- NEW FILE rt2860-kmod.spec --- # buildforkernels macro hint: when you build a new version or a new release # that contains bugfixes or other improvements then you must disable the # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed #define buildforkernels newest %define SourceDir 2008_0708_RT2860_Linux_STA_v1.7.0.0 %define _default_patch_fuzz 2 Name: rt2860-kmod Version: 1.7.0 Release: 6%{?dist}.1 Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel License: GPLv2+ URL: http://www.ralinktech.com/ Source0: http://www.ralinktech.com.tw/data/drivers/%{SourceDir}.tar.bz2 Source11: rt2860-kmodtool-excludekernel-filterfile Patch0: rt2860-remove-tftpboot-copy.patch Patch1: rt2860-add-network-mgr-support.diff Patch2: rt2860-dat-install-fixes.patch Patch3: rt2860-2.6.25-iwe_stream-fix.diff Patch4: rt2860-net-namespace-separation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i586 i686 x86_64 # disabled hy knurd on 20081002 as they fail: ppc ppc64 # get the needed BuildRequires (in parts depending on what we build for) BuildRequires: %{_bindir}/kmodtool %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } # kmodtool does its magic here %{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description This package contains the Ralink Driver for WiFi, a linux device driver for 802.11a/b/g universal NIC cards - either PCI, PCIe or MiniPCI - that use Ralink chipsets (rt2760, rt2790, rt2860, rt2890). %prep # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -T -a 0 (cd %{SourceDir} ; %patch0 -p1 -b .tftpboot %patch1 -p1 -b .network-mgr %patch2 -p1 -b .dat-install %patch3 -p1 -b .2.6.25.fixes %patch4 -p1 -b .patch ) for kernel_version in %{?kernel_versions} ; do cp -a %{SourceDir} _kmod_build_${kernel_version%%___*} done %build for kernel_version in %{?kernel_versions} ; do pushd _kmod_build_${kernel_version%%___*} make LINUX_SRC="${kernel_version##*___}" popd done %install rm -rf $RPM_BUILD_ROOT for kernel_version in %{?kernel_versions} ; do make -C _kmod_build_${kernel_version%%___*} LINUX_SRC="${kernel_version##*___}" LINUX_SRC_MODULE=$RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} DAT_PREFIX=$RPM_BUILD_ROOT install done # allow stripping: chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* || : # file is part of the common package: rm -fr $RPM_BUILD_ROOT/etc || : # akmods: %{?akmod_install} %clean rm -rf $RPM_BUILD_ROOT %changelog * Tue Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-6.1 - disable ppc ppc64; both fail * Tue Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-5.1 - rebuild for RPM Fusion * Sun Sep 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-4 - _default_patch_fuzz 2 for new rpm - make some comments in install section not fail when building akmod package * Fri Sep 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-3 - add rt2860-net-namespace-separation.patch to make it compile with 2.6.26.3 from Fedora; patch provided by James as text in #2083 - License is GPLv2+ * Fri Sep 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-2 - some small fixes and cleanups * Fri Aug 29 2008 James Bottomley <James.Bottomley [AT] hansenpartnership [DOT] com> 1.7.0-1 - Initial Version - Applied patch to fix up around iwe_mark interface changes --- NEW FILE rt2860-kmodtool-excludekernel-filterfile --- xen$ rt2860-net-namespace-separation.patch: --- NEW FILE rt2860-net-namespace-separation.patch --- --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/rt_main_dev.c 2008-06-3022:31:10.000000000 -0500 +++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/os/linux/rt_main_dev.c 2008-09-05 12:53:04.000000000 -0500 @@ -801,7 +801,15 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) - device = dev_get_by_name(dev->nd_net, slot_name); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) +#ifdef CONFIG_NET_NS + device = dev_get_by_name(dev->nd_net, slot_name); +#else + device = dev_get_by_name(&init_net, slot_name); +#endif +#else + device = dev_get_by_name(dev->nd_net, slot_name); +#endif #else device = dev_get_by_name(slot_name); #endif rt2860-remove-tftpboot-copy.patch: --- NEW FILE rt2860-remove-tftpboot-copy.patch --- diff -u -r 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/Makefile --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile 2008-06-30 20:20:26.000000000 -0500 +++ 2008_0708_RT2860_Linux_STA_v1.7.0.0.new/Makefile 2008-08-29 11:42:25.000000000 -0500 @@ -101,11 +101,9 @@ ifneq (,$(findstring 2.4,$(LINUX_SRC))) cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile make -C $(RT28xx_DIR)/os/linux/ - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot else cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot endif clean: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Oct 2008 20:31:20 -0000 1.1 +++ .cvsignore 3 Oct 2008 09:55:08 -0000 1.2 @@ -0,0 +1 @@ +2008_0708_RT2860_Linux_STA_v1.7.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Oct 2008 20:31:20 -0000 1.1 +++ sources 3 Oct 2008 09:55:08 -0000 1.2 @@ -0,0 +1 @@ +523a42e4a86cf627dd34917e93fa2ce5 2008_0708_RT2860_Linux_STA_v1.7.0.0.tar.bz2