Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5c9e60444857897ddbe23135deacda6b70c3e3be
commit 5c9e60444857897ddbe23135deacda6b70c3e3be Author: janny <[EMAIL PROTECTED]> Date: Tue Mar 4 23:48:39 2008 +0100 madwifi-fwlive-0.9.4-2-i686 * version bump in fwlive repo diff --git a/source/network/madwifi-fwlive/FrugalBuild b/source/network/madwifi-fwlive/FrugalBuild index 802c2c4..87846f9 100644 --- a/source/network/madwifi-fwlive/FrugalBuild +++ b/source/network/madwifi-fwlive/FrugalBuild @@ -2,40 +2,35 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=madwifi-fwlive -pkgver=0.9.3.1 -pkgrel=4 +_F_archive_name=madwifi +_F_sourceforge_name=madwifi +pkgver=0.9.4 +pkgrel=2 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/"; -#Finclude kernel-module -#depends=([EMAIL PROTECTED] 'wireless_tools') -replaces=('madwifi-ng') -#makedepends=([EMAIL PROTECTED] 'sharutils') -kver=2.6.22-1 +Finclude kernel-module sourceforge +kver=2.6.24-3 depends=("kernel-fwlive=$kver" 'wireless_tools') +replaces=('madwifi-ng') makedepends=("kernel-fwlive-source=$kver" 'sharutils') -_F_kernelmod_uname=`echo $kver|sed 's/-/-fw/'` -_F_kernelmod_dir="/lib/modules/$_F_kernelmod_uname" groups=('network') archs=('i686' 'x86_64') -_F_sourceforge_name="madwifi" -_F_rcd_name="madwifi" -Finclude sourceforge -source=($source madwifi-0.9.3-cflags.diff madwifi-0.9.3.1-kernel2622.diff) -sha1sums=('690543c825b8b49186e4613a286b39114fff3c11' \ - '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \ - 'b61d7e0bc2da632e399abbe6b6bef92f6a73d7cc') +source=($source madwifi-0.9.3-cflags.diff) +sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \ + '26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35') # If the package needs testing, feel free to poke Benjamin Woods <[EMAIL PROTECTED]> build() { + Fcd $_F_archive_name-$pkgver # no Fcheckkernel, crosscompilation verified - Fcd madwifi-$pkgver Fpatchall KERNELPATH=/usr/src/linux Fmake Fmakeinstall KERNELPATH=/usr/src/linux \ MODULEPATH=$_F_kernelmod_dir/kernel/drivers/net/wireless \ BINDIR=/usr/bin MANDIR=/usr/man + Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff b/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff deleted file mode 100644 index eea54e8..0000000 --- a/source/network/madwifi-fwlive/madwifi-0.9.3.1-kernel2622.diff +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur madwifi-0.9.3.1.orig/Makefile.inc madwifi-0.9.3.1/Makefile.inc ---- madwifi-0.9.3.1.orig/Makefile.inc 2007-01-18 09:26:23.000000000 +0100 -+++ madwifi-0.9.3.1/Makefile.inc 2007-07-10 14:45:07.000000000 +0200 -@@ -146,7 +146,7 @@ - # - TOOLS= $(TOP)/tools - --COPTS+= -Werror -+#COPTS+= -Werror - INCS= -include $(TOP)/include/compat.h -I$(TOP)/include - - # TARGET defines the target platform architecture. It must match one of -diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_input.c madwifi-0.9.3.1/net80211/ieee80211_input.c ---- madwifi-0.9.3.1.orig/net80211/ieee80211_input.c 2007-05-23 10:43:05.000000000 +0200 -+++ madwifi-0.9.3.1/net80211/ieee80211_input.c 2007-07-10 14:45:21.000000000 +0200 -@@ -1048,11 +1048,12 @@ - * incoming fragments - * XXX 4-address/QoS frames? - */ -- else if (skb->end - skb->head < ni->ni_vap->iv_dev->mtu + -- hdrlen) { -+ else if (skb_end_pointer(skb) - skb->head < -+ ni->ni_vap->iv_dev->mtu + hdrlen) { - ni->ni_rxfrag = skb_copy_expand(skb, 0, - (ni->ni_vap->iv_dev->mtu + hdrlen) - -- (skb->end - skb->head), GFP_ATOMIC); -+ (skb_end_pointer(skb) - skb->head), -+ GFP_ATOMIC); - dev_kfree_skb(skb); - } - } -@@ -1136,8 +1137,8 @@ - } - if (skb1 != NULL) { - skb1->dev = dev; -- skb1->mac.raw = skb1->data; -- skb1->nh.raw = skb1->data + sizeof(struct ether_header); -+ skb_reset_mac_header(skb1); -+ skb1->network_header = skb1->data + sizeof(struct ether_header); - skb1->protocol = __constant_htons(ETH_P_802_2); - /* XXX insert vlan tag before queue it? */ - dev_queue_xmit(skb1); -@@ -2259,7 +2260,7 @@ - if (skb1 == NULL) - return; - skb1->dev = dev; -- skb1->mac.raw = skb1->data; -+ skb_reset_mac_header(skb1); - skb1->ip_summed = CHECKSUM_NONE; - skb1->pkt_type = PACKET_OTHERHOST; - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ -@@ -2534,7 +2535,7 @@ - - skb->dev = dev; - skb->protocol = eth_type_trans(skb, dev); -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - ieee80211_deliver_data(ni, skb); - return; - } -@@ -3712,15 +3713,15 @@ - ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev) - { - struct ethhdr *eth; -- -- skb->mac.raw=skb->data; -+ -+ skb_reset_mac_header(skb); - skb_pull(skb, ETH_HLEN); - /* - * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but - * since that's an inline and not a define there's - * no easy way to do this cleanly. - */ -- eth = (struct ethhdr *)skb->mac.raw; -+ eth = eth_hdr(skb); - - if (*eth->h_dest & 1) - if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) -diff -Naur madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c madwifi-0.9.3.1/net80211/ieee80211_monitor.c ---- madwifi-0.9.3.1.orig/net80211/ieee80211_monitor.c 2007-02-15 00:45:48.000000000 +0100 -+++ madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-07-10 14:45:14.000000000 +0200 -@@ -373,7 +373,7 @@ - if (vap->iv_monitor_txf_len && tx) { - /* truncate transmit feedback packets */ - skb_trim(skb1, vap->iv_monitor_txf_len); -- skb1->nh.raw = skb1->data; -+ skb1->network_header = skb1->data; - } - switch (vap->iv_dev->type) { - case ARPHRD_IEEE80211: -@@ -555,7 +555,7 @@ - skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN); - } - skb1->dev = dev; /* NB: deliver to wlanX */ -- skb1->mac.raw = skb1->data; -+ skb_reset_mac_header(skb1); - skb1->ip_summed = CHECKSUM_NONE; - skb1->pkt_type = pkttype; - skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
