[arch-commits] Commit in rt2500/trunk (PKGBUILD kernel-2.6.29.patch rt2500.install)
Tobias Powalowski
tpowa at archlinux.org
Wed Mar 25 10:00:26 UTC 2009
Date: Wednesday, March 25, 2009 @ 06:00:25
Author: tpowa
Revision: 31263
upgpkg: rt2500 1.1.0_B4-27
Added:
rt2500/trunk/kernel-2.6.29.patch
Modified:
rt2500/trunk/PKGBUILD
rt2500/trunk/rt2500.install
---------------------+
PKGBUILD | 15 ++--
kernel-2.6.29.patch | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++
rt2500.install | 6 -
3 files changed, 198 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-25 09:58:05 UTC (rev 31262)
+++ PKGBUILD 2009-03-25 10:00:25 UTC (rev 31263)
@@ -2,30 +2,33 @@
# Maintainer: James Rayner <iphitus at gmail.com>
pkgname=rt2500
-_kernver=2.6.28-ARCH
+_kernver=2.6.29-ARCH
pkgver=1.1.0_B4
_pkgver=1.1.0-b4
-pkgrel=26
+pkgrel=27
pkgdesc="Drivers for rt2500 chipset wireless cards"
url="http://rt2x00.serialmonkey.com/wiki/index.php/Main_Page"
license=('GPL2')
-depends=('kernel26>=2.6.28' 'kernel26<2.6.29')
+depends=('kernel26>=2.6.29' 'kernel26<2.6.30')
arch=('i686' 'x86_64')
install=rt2500.install
source=(http://downloads.sourceforge.net/sourceforge/rt2400/rt2500-${_pkgver}.tar.gz \
kernel-2.6.22.patch
kernel-2.6.24.patch
- kernel-2.6.27.patch)
+ kernel-2.6.27.patch
+ kernel-2.6.29.patch)
md5sums=('83b8b9a091705c08d99268479f3b3b6a'
'a74f8e9cbba7b29620f11fba8fd7c50d'
- 'ccf0da667cc6642dacf39dea1aac254f'
- 'ccb923f4ebf408e781544d7cf4074bf2')
+ 'ccf0da667cc6642dacf39dea1aac254f'
+ 'ccb923f4ebf408e781544d7cf4074bf2'
+ 'd6f5927634db76a6af2a9d883e389987')
build() {
cd $startdir/src/rt2500-$_pkgver/
patch -Np1 -i ../kernel-2.6.22.patch || return 1
patch -Np1 -i ../kernel-2.6.24.patch || return 1
patch -Np1 -i ../kernel-2.6.27.patch || return 1
+ patch -Np0 -i ../kernel-2.6.29.patch || return 1
cd $startdir/src/rt2500-$_pkgver/Module
make KERNDIR=/lib/modules/$_kernver/build || return 1
install -D -m 644 rt2500.ko $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/rt2500.ko
Added: kernel-2.6.29.patch
===================================================================
--- kernel-2.6.29.patch (rev 0)
+++ kernel-2.6.29.patch 2009-03-25 10:00:25 UTC (rev 31263)
@@ -0,0 +1,186 @@
+--- Module/rtmp_main.c~ 2009-03-25 10:37:07.000000000 +0100
++++ Module/rtmp_main.c 2009-03-25 10:37:07.000000000 +0100
+@@ -272,7 +272,7 @@
+
+ // Save CSR virtual address and irq to device structure
+ net_dev->base_addr = (unsigned long)csr_addr;
+- pAd = net_dev->priv;
++ pAd = netdev_priv(net_dev);
+ pAd->CSRBaseAddress = net_dev->base_addr;
+ pAd->net_dev = net_dev;
+
+@@ -369,7 +369,7 @@
+ INT RT2500_open(
+ IN struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+ INT status = NDIS_STATUS_SUCCESS;
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+@@ -491,7 +491,7 @@
+ IN struct net_device *net_dev)
+ {
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+- PRTMP_ADAPTER pAdapter = net_dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_INFO, "<==== RTMPSendPackets\n");
+
+@@ -576,7 +576,7 @@
+ #endif
+ {
+ struct net_device *net_dev = dev_instance;
+- PRTMP_ADAPTER pAdapter = net_dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(net_dev);
+ INTSRC_STRUC IntSource;
+ int ret = 0;
+
+@@ -689,7 +689,7 @@
+
+ int rt2500_set_mac_address(struct net_device *net_dev, void *addr)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ struct sockaddr *mac = (struct sockaddr*) addr;
+ u32 set_mac;
+
+@@ -747,7 +747,7 @@
+ struct iw_statistics *RT2500_get_wireless_stats(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+
+ // TODO: All elements are zero before be implemented
+
+@@ -789,7 +789,7 @@
+ struct net_device_stats *RT2500_get_ether_stats(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_INFO, "RT2500_get_ether_stats --->\n");
+
+@@ -849,7 +849,7 @@
+ IN struct net_device *net_dev)
+ {
+ RTMP_ADAPTER *pAd;
+- pAd = net_dev->priv;
++ pAd = netdev_priv(net_dev);
+ if (pAd->PortCfg.BssType == BSS_MONITOR)
+ {
+ RTMP_IO_WRITE32(pAd, RXCSR0, 0x46);
+@@ -876,7 +876,7 @@
+ INT RT2500_close(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ // LONG ioaddr = net_dev->base_addr;
+
+ DBGPRINT(RT_DEBUG_TRACE, "%s: ===> RT2500_close\n", net_dev->name);
+@@ -930,7 +930,7 @@
+ rt2500pci_close_debugfs(pAd);
+
+ // Free Ring buffers
+- RTMPFreeDMAMemory(net_dev->priv);
++ RTMPFreeDMAMemory(netdev_priv(net_dev));
+
+ // Unregister network device
+ unregister_netdev(net_dev);
+@@ -970,7 +970,7 @@
+ static int rt2500_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+ struct net_device *dev = pci_get_drvdata(pdev);
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+
+
+ if(pAdapter->PortCfg.bRadio)
+@@ -1001,7 +1001,7 @@
+ static int rt2500_resume(struct pci_dev *pdev)
+ {
+ struct net_device *dev = pci_get_drvdata(pdev);
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+ int status;
+
+ // FIXME: code should process error case correctly
+--- Module/rtmp_init.c~ 2009-03-25 10:55:00.000000000 +0100
++++ Module/rtmp_init.c 2009-03-25 10:55:00.000000000 +0100
+@@ -1406,9 +1406,8 @@
+
+ // Save uid and gid used for filesystem access.
+ // Set user and group to 0 (root)
+- orgfsuid = current->fsuid;
+- orgfsgid = current->fsgid;
+- current->fsuid=current->fsgid = 0;
++ orgfsuid = current_fsuid();
++ orgfsgid = current_fsgid();
+ orgfs = get_fs();
+ set_fs(KERNEL_DS);
+
+@@ -1983,9 +1982,11 @@
+ }
+ } //if (src && *src)
+
+- set_fs(orgfs);
+- current->fsuid = orgfsuid;
+- current->fsgid = orgfsgid;
++ set_fs(orgfs);
++#if 0
++ current->cred->fsuid = orgfsuid;
++ current->cred->fsgid = orgfsgid;
++#endif
+ kfree(buffer);
+ }
+ /*
+--- Module/rtmp_info.c~ 2009-03-25 10:59:09.000000000 +0100
++++ Module/rtmp_info.c 2009-03-25 10:59:09.000000000 +0100
+@@ -235,7 +235,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+ struct iw_range *range = (struct iw_range *) extra;
+ u16 val;
+ int i,chan;
+@@ -344,7 +344,7 @@
+ rt_ioctl_setparam(struct net_device *dev, struct iw_request_info *info,
+ void *w, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+ char *this_char;
+ char *value;
+ int Status;
+@@ -392,7 +392,7 @@
+ struct iw_point *data, char *extra)
+ {
+ ULONG Now;
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+ int Status = NDIS_STATUS_SUCCESS;
+ BOOLEAN StateMachineTouched = FALSE;
+
+@@ -452,7 +452,7 @@
+ struct iw_point *data, char *extra)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) netdev_priv(dev);
+ int i=2, j;
+ char *current_ev = extra;
+ char *end_buf = extra + IW_SCAN_MAX_DATA;
+@@ -1653,7 +1653,7 @@
+ IN OUT struct ifreq *rq,
+ IN INT cmd)
+ {
+- PRTMP_ADAPTER pAdapter= net_dev->priv;
++ PRTMP_ADAPTER pAdapter= netdev_priv(net_dev);
+ struct iwreq *wrq = (struct iwreq *) rq;
+ struct iw_point *erq = NULL;
+ struct iw_freq *frq = NULL;
Modified: rt2500.install
===================================================================
--- rt2500.install 2009-03-25 09:58:05 UTC (rev 31262)
+++ rt2500.install 2009-03-25 10:00:25 UTC (rev 31263)
@@ -1,7 +1,7 @@
# arg 1: the new package version
post_install()
{
- KERNEL_VERSION='2.6.28-ARCH'
+ KERNEL_VERSION='2.6.29-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
@@ -9,14 +9,14 @@
# arg 2: the old package version
post_upgrade()
{
- KERNEL_VERSION='2.6.28-ARCH'
+ KERNEL_VERSION='2.6.29-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
# arg 1: the old package version
post_remove()
{
- KERNEL_VERSION='2.6.28-ARCH'
+ KERNEL_VERSION='2.6.29-ARCH'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
More information about the arch-commits
mailing list