mail archive Frugalware git commit messages
frugalware-git.frugalware.org
(List home) (Recent threads) (9 other Frugalware Linux lists)
Subscription Options
- RSS or Atom: Read-only subscription using a browser or aggregator. This is the recommended way if you don't need to send messages to the list. You can learn more about feed syndication and clients here.
- Conventional: All messages are delivered to your mail address, and you can reply. To subscribe, send an email to the list's subscribe address with "subscribe" in the subject line, or visit the list's homepage here.
- High traffic list: 30+ messages per day
- This list contains about 83,317 messages, beginning Aug 2009
- 20 messages added yesterday
Report the Spam
This button sends a spam report to the moderator. Please use it sparingly. For other removal requests, read this.
Are you sure? yes no
ryuotesting: ndiswrapper-1.57-12-x86_64 * rebuild with kernel 3.3 * import patch to fix build from mageia
Ad
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p... commit 149ddba9d6d72e9391d8fd6814ead6d0c573e4e7 Author: James Buren Date: Fri Mar 23 10:49:36 2012 -0500 ndiswrapper-1.57-12-x86_64 * rebuild with kernel 3.3 * import patch to fix build from mageia diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 36f8496..1decadd 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,17 +4,18 @@ pkgname=ndiswrapper pkgver=1.57 -pkgrel=11 +pkgrel=12 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -source=("${source[@]}" README.Frugalware ndiswrapper-detect-fix-x86_64.patch) +source=("${source[@]}" README.Frugalware ndiswrapper-detect-fix-x86_64.patch kernel-3.3.patch) sha1sums=('faa896fd16e43fb93f4e10d9e9f76027c7e6d402' \ 'c3f24143cb9814326a2c0c3cbc8d58d953bac268' \ - '7e46cc4bb72520d911f256748e8c3936498f001b') + '7e46cc4bb72520d911f256748e8c3936498f001b' \ + '4589a4b40e600e7c9755ca7b7415fa6b7ec22b10') build() { diff --git a/source/network-extra/ndiswrapper/kernel-3.3.patch b/source/network-extra/ndiswrapper/kernel-3.3.patch new file mode 100644 index 0000000..c252b91 --- /dev/null +++ b/source/network-extra/ndiswrapper/kernel-3.3.patch @@ -0,0 +1,77 @@ + +This adapte the code to build with 3.3 series kernels. + +1. kstat_cpu* -> kcpustat_cpu*[] + +2. *ethtool interface -> netdev->HW_FEATURES + +Signed-off-by: Thomas Backlund + + + 3rdparty/ndiswrapper/ndis.c | 6 ++++++ + 3rdparty/ndiswrapper/wrapndis.c | 8 ++++++++ + 2 files changed, 14 insertions(+) + +diff -Nurp a/driver/ndis.c b/driver/ndis.c +--- a/driver/ndis.c 2012-03-04 22:29:20.000000000 +0200 ++++ b/driver/ndis.c 2012-03-05 00:31:38.917901654 +0200 +@@ -2654,9 +2654,15 @@ wstdcall void WIN_FUNC(NdisGetCurrentPro + (ULONG *idle, ULONG *kernel_user, ULONG *index) + { + int cpu = smp_processor_id(); ++#if LINUX_VERSION_CODE < KERNEL_VERSION( 3, 3, 0) + *idle = kstat_cpu(cpu).cpustat.idle; + *kernel_user = kstat_cpu(cpu).cpustat.system + + kstat_cpu(cpu).cpustat.user; ++#else ++ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE]; ++ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] + ++ kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; ++#endif + *index = cpu; + } + +diff -Nurp a/driver/wrapndis.c b/driver/wrapndis.c +--- a/driver/wrapndis.c 2012-03-04 22:29:20.000000000 +0200 ++++ b/driver/wrapndis.c 2012-03-05 00:38:20.529968747 +0200 +@@ -1675,6 +1675,7 @@ static int ndis_set_wol(struct net_devic + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) + static u32 ndis_get_tx_csum(struct net_device *dev) + { + struct ndis_device *wnd = netdev_priv(dev); +@@ -1735,18 +1736,21 @@ static int ndis_set_sg(struct net_device + else + return -EOPNOTSUPP; + } ++#endif + + static struct ethtool_ops ndis_ethtool_ops = { + .get_drvinfo = ndis_get_drvinfo, + .get_link = ndis_get_link, + .get_wol = ndis_get_wol, + .set_wol = ndis_set_wol, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) + .get_tx_csum = ndis_get_tx_csum, + .get_rx_csum = ndis_get_rx_csum, + .set_tx_csum = ndis_set_tx_csum, + .set_rx_csum = ndis_set_rx_csum, + .get_sg = ndis_get_sg, + .set_sg = ndis_set_sg, ++#endif + }; + + static int notifier_event(struct notifier_block *notifier, unsigned long event, +@@ -1837,6 +1841,10 @@ static NDIS_STATUS ndis_start_device(str + NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + net_dev->netdev_ops = &ndis_netdev_ops; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) ++ net_dev->hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM | ++ NETIF_F_RXCSUM; ++#endif + #else + net_dev->init = ndis_net_dev_init; + net_dev->uninit = ndis_net_dev_uninit;