Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f963545e8c671ad9e30b9dbca6b25ec71ca462b4
commit f963545e8c671ad9e30b9dbca6b25ec71ca462b4 Author: Miklos Vajna <vmik...@frugalware.org> Date: Tue Apr 14 11:37:26 2009 +0200 r8169-6.009.00-7-i686 - kernel-2.6.29 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 419e11f..bdf745c 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.009.00 -pkgrel=6 +pkgrel=7 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw"; @@ -11,10 +11,12 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="Flasttar ftp://202.65.194.211/cn/nic/"; source=(ftp://202.65.194.211/cn/nic/${pkgname}-${pkgver}.tar.bz2 README.Frugalware \ - 0001-NET-Nuke-SET_MODULE_OWNER-macro.patch) + 0001-NET-Nuke-SET_MODULE_OWNER-macro.patch \ + kernel-2.6.29.patch) sha1sums=('f963f742ac0dc4a3e6d461bc40b86dd83f09b280' \ '21b9e951b8470946d0af2ce1a0527c1d0153dc3f' \ - 'f965b8f6c3169027cf342110c8744b2cb1aed673') + 'f965b8f6c3169027cf342110c8744b2cb1aed673' \ + '74f035ce57db4fc8cd4841f9c210704b7c33ea83') build() { unset MAKEFLAGS diff --git a/source/network-extra/r8169/kernel-2.6.29.patch b/source/network-extra/r8169/kernel-2.6.29.patch new file mode 100644 index 0000000..63c9584 --- /dev/null +++ b/source/network-extra/r8169/kernel-2.6.29.patch @@ -0,0 +1,41 @@ +diff --git a/src/r8169.h b/src/r8169.h +index 13316fa..633aa64 100644 +--- a/src/r8169.h ++++ b/src/r8169.h +@@ -237,9 +237,9 @@ extern void __chk_io_ptr(void __iomem *); + #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; + #define RTL_RX_QUOTA(ndev, budget) budget + #define RTL_NAPI_QUOTA_UPDATE(ndev, work_done, budget) +- #define RTL_NETIF_RX_COMPLETE(dev, napi) netif_rx_complete(dev, napi) +- #define RTL_NETIF_RX_SCHEDULE_PREP(dev, napi) netif_rx_schedule_prep(dev, napi) +- #define __RTL_NETIF_RX_SCHEDULE(dev, napi) __netif_rx_schedule(dev, napi) ++ #define RTL_NETIF_RX_COMPLETE(napi) netif_rx_complete(napi) ++ #define RTL_NETIF_RX_SCHEDULE_PREP(napi) netif_rx_schedule_prep(napi) ++ #define __RTL_NETIF_RX_SCHEDULE(napi) __netif_rx_schedule(napi) + #define RTL_NAPI_RETURN_VALUE work_done + #define RTL_NAPI_ENABLE(dev, napi) napi_enable(napi) + #define RTL_NAPI_DISABLE(dev, napi) napi_disable(napi) +diff --git a/src/r8169_n.c b/src/r8169_n.c +index c38519e..404897f 100644 +--- a/src/r8169_n.c ++++ b/src/r8169_n.c +@@ -3654,8 +3654,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) + RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event); + tp->intr_mask = ~rtl8169_napi_event; + +- if (likely(RTL_NETIF_RX_SCHEDULE_PREP(dev, &tp->napi))) { +- __RTL_NETIF_RX_SCHEDULE(dev, &tp->napi); ++ if (likely(RTL_NETIF_RX_SCHEDULE_PREP(&tp->napi))) { ++ __RTL_NETIF_RX_SCHEDULE(&tp->napi); + } else if (netif_msg_intr(tp)) { + printk(KERN_INFO "%s: interrupt %04x in poll\n", + dev->name, status); +@@ -3707,7 +3707,7 @@ static int rtl8169_poll(napi_ptr napi, napi_budget budget) + RTL_NAPI_QUOTA_UPDATE(dev, work_done, budget); + + if (work_done < work_to_do) { +- RTL_NETIF_RX_COMPLETE(dev, napi); ++ RTL_NETIF_RX_COMPLETE(napi); + tp->intr_mask = rtl8169_intr_mask; + /* + * 20040426: the barrier is not strictly required but the _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
