r277 - in /unstable/madwifi/debian: changelog control control.modules.in madwifi-doc.docs madwifi-source.README.debian patches/00list patches/10_compat-0.9.3-2.6.22.dpatch
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jul 11 05:49:03 UTC 2007
Author: kelmo-guest
Date: Wed Jul 11 05:49:03 2007
New Revision: 277
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=277
Log:
* No longer provide madwifi-doc, upstream abandoned it.
[debian/madwifi-doc.*, debian/control,
debian/madwifi-source.README.debian]
* No longer conflict with madwifi-ng-modules-_KVERS_, no package in debian
ever provided that. Also remove spurious Provides.
* Add patches/10_compat-0.9.3-2.6.22.dpatch for linux 2.6.22 compatibility.
(Closes: #432531)
Added:
unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch
Removed:
unstable/madwifi/debian/madwifi-doc.docs
Modified:
unstable/madwifi/debian/changelog
unstable/madwifi/debian/control
unstable/madwifi/debian/control.modules.in
unstable/madwifi/debian/madwifi-source.README.debian
unstable/madwifi/debian/patches/00list
Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=277&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Wed Jul 11 05:49:03 2007
@@ -2,8 +2,16 @@
* Format Homepage fileds. [debian/control]
* Add XS-Vcs-* fields. [debian/control]
-
- -- Kel Modderman <kel at otaku42.de> Thu, 24 May 2007 13:46:20 +1000
+ * No longer provide madwifi-doc, upstream abandoned it.
+ [debian/madwifi-doc.*, debian/control,
+ debian/madwifi-source.README.debian]
+ * No longer conflict with madwifi-ng-modules-_KVERS_, no package in debian
+ ever provided that. Also remove spurious Provides.
+ [debian/control.modules.in]
+ * Add patches/10_compat-0.9.3-2.6.22.dpatch for linux 2.6.22 compatibility.
+ (Closes: #432531)
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 11 Jul 2007 15:42:26 +1000
madwifi (1:0.9.3-2) unstable; urgency=low
Modified: unstable/madwifi/debian/control
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/control?rev=277&op=diff
==============================================================================
--- unstable/madwifi/debian/control (original)
+++ unstable/madwifi/debian/control Wed Jul 11 05:49:03 2007
@@ -11,20 +11,10 @@
Package: madwifi-source
Architecture: all
Depends: module-assistant, debhelper (>= 5.0.37), bzip2
-Suggests: kernel-package, madwifi-tools, madwifi-doc
+Suggests: kernel-package, madwifi-tools
Description: source for the Multiband Atheros Driver for WiFi
This package provides the source code for the madwifi kernel modules.
The madwifi-tools package is also required in order to make use of these
modules. Kernel source or headers are required to compile these modules.
.
Homepage: http://madwifi.org/
-
-Package: madwifi-doc
-Section: non-free/doc
-Replaces: madwifi-ng-doc
-Architecture: all
-Description: documentation for the Multiband Atheros Driver for WiFi
- This package provides the users-guide for the madwifi kernel modules and
- userspace tools. It is in pdf format.
- .
- Homepage: http://madwifi.org/
Modified: unstable/madwifi/debian/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/control.modules.in?rev=277&op=diff
==============================================================================
--- unstable/madwifi/debian/control.modules.in (original)
+++ unstable/madwifi/debian/control.modules.in Wed Jul 11 05:49:03 2007
@@ -10,8 +10,6 @@
Architecture: any
Depends: madwifi-tools, linux-image-_KVERS_ | kernel-image-_KVERS_
Recommends: wireless-tools
-Replaces: madwifi-ng-modules-_KVERS_
-Provides: madwifi-modules-_KVERS_
Description: modules for the Multiband Atheros Driver for WiFi (kernel _KVERS_)
This package contains the set of loadable kernel modules for Atheros
based WiFi chipsets.
Modified: unstable/madwifi/debian/madwifi-source.README.debian
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/madwifi-source.README.debian?rev=277&op=diff
==============================================================================
--- unstable/madwifi/debian/madwifi-source.README.debian (original)
+++ unstable/madwifi/debian/madwifi-source.README.debian Wed Jul 11 05:49:03 2007
@@ -50,14 +50,6 @@
MadWifi Documentation
=====================
-The 'madwifi-doc' package contains the madwifi users-guide, a comprhensive
-document containing all infomation pertaining to the administration of the
-madwifi kernel modules and userspace tools.
-
-The madwifi-doc packages installs the document to:-
-
- /usr/share/doc/madwifi-doc/users-guide.pdf.gz
-
The madwifi developers maintain an excellent resource:
http://madwifi.org/
Modified: unstable/madwifi/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/00list?rev=277&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/00list (original)
+++ unstable/madwifi/debian/patches/00list Wed Jul 11 05:49:03 2007
@@ -1,3 +1,4 @@
01_secfix-0.9.3-sizecheck-take3
02_secfix-0.9.3-wmmparams-take2
03_secfix-0.9.3-beacon_interval_range
+10_compat-0.9.3-2.6.22
Added: unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch?rev=277&op=file
==============================================================================
--- unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch (added)
+++ unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch Wed Jul 11 05:49:03 2007
@@ -1,0 +1,166 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 2.6.22-compat.patch by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://madwifi.org/changeset/2386
+## DP: http://madwifi.org/changeset/2339
+
+ at DPATCH@
+diff -Nrup madwifi-0.9.3/ath/if_ath_pci.c madwifi-0.9.3-2.6.22/ath/if_ath_pci.c
+--- madwifi-0.9.3/ath/if_ath_pci.c 2007-01-22 13:07:30.000000000 +1000
++++ madwifi-0.9.3-2.6.22/ath/if_ath_pci.c 2007-07-11 15:25:50.000000000 +1000
+@@ -207,7 +207,11 @@ ath_pci_probe(struct pci_dev *pdev, cons
+
+ pci_set_drvdata(pdev, dev);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++ if (request_irq(pdev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
++#else
+ if (request_irq(dev->irq, ath_intr, SA_SHIRQ, dev->name, dev)) {
++#endif
+ printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+ goto bad3;
+ }
+diff -Nrup madwifi-0.9.3/include/compat.h madwifi-0.9.3-2.6.22/include/compat.h
+--- madwifi-0.9.3/include/compat.h 2007-03-03 03:42:33.000000000 +1000
++++ madwifi-0.9.3-2.6.22/include/compat.h 2007-07-11 15:04:00.000000000 +1000
+@@ -130,6 +130,39 @@
+ #define __iomem
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
++#include <linux/skbuff.h>
++static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
++{
++ return skb->end;
++}
++
++static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
++{
++ return skb->tail;
++}
++
++static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
++{
++ skb->nh.raw = skb->data + offset;
++}
++
++static inline void skb_reset_network_header(struct sk_buff *skb)
++{
++ skb->nh.raw = skb->data;
++}
++
++static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
++{
++ return skb->mac.raw;
++}
++
++static inline void skb_reset_mac_header(struct sk_buff *skb)
++{
++ skb->mac.raw = skb->data;
++}
++#endif
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _ATH_COMPAT_H_ */
+diff -Nrup madwifi-0.9.3/net80211/ieee80211_input.c madwifi-0.9.3-2.6.22/net80211/ieee80211_input.c
+--- madwifi-0.9.3/net80211/ieee80211_input.c 2007-02-03 06:01:51.000000000 +1000
++++ madwifi-0.9.3-2.6.22/net80211/ieee80211_input.c 2007-07-11 15:12:53.000000000 +1000
+@@ -1039,11 +1039,12 @@ ieee80211_defrag(struct ieee80211_node *
+ * 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);
+ }
+ }
+@@ -1057,7 +1058,7 @@ ieee80211_defrag(struct ieee80211_node *
+ * we've verified that before
+ */
+ /* Copy current fragment at end of previous one */
+- memcpy(ni->ni_rxfrag->tail,
++ memcpy(skb_tail_pointer(ni->ni_rxfrag),
+ skb->data + hdrlen, skb->len - hdrlen);
+ /* Update tail and length */
+ skb_put(ni->ni_rxfrag, skb->len - hdrlen);
+@@ -1127,8 +1128,10 @@ ieee80211_deliver_data(struct ieee80211_
+ }
+ 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);
++ skb_set_network_header(skb1, sizeof(struct ether_header));
++
+ skb1->protocol = __constant_htons(ETH_P_802_2);
+ /* XXX insert vlan tag before queue it? */
+ dev_queue_xmit(skb1);
+@@ -2250,7 +2253,8 @@ forward_mgmt_to_app(struct ieee80211vap
+ 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 */
+@@ -2525,7 +2529,8 @@ ieee80211_deliver_l2uf(struct ieee80211_
+
+ 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;
+ }
+@@ -3691,14 +3696,14 @@ ath_eth_type_trans(struct sk_buff *skb,
+ {
+ 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 = (struct ethhdr *)skb_mac_header(skb);
+
+ if (*eth->h_dest & 1)
+ if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
+diff -Nrup madwifi-0.9.3/net80211/ieee80211_monitor.c madwifi-0.9.3-2.6.22/net80211/ieee80211_monitor.c
+--- madwifi-0.9.3/net80211/ieee80211_monitor.c 2007-02-15 09:45:48.000000000 +1000
++++ madwifi-0.9.3-2.6.22/net80211/ieee80211_monitor.c 2007-07-11 15:15:52.000000000 +1000
+@@ -373,7 +373,7 @@ ieee80211_input_monitor(struct ieee80211
+ if (vap->iv_monitor_txf_len && tx) {
+ /* truncate transmit feedback packets */
+ skb_trim(skb1, vap->iv_monitor_txf_len);
+- skb1->nh.raw = skb1->data;
++ skb_reset_network_header(skb1);
+ }
+ switch (vap->iv_dev->type) {
+ case ARPHRD_IEEE80211:
+@@ -555,7 +555,8 @@ ieee80211_input_monitor(struct ieee80211
+ 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 */
More information about the Pkg-madwifi-maintainers
mailing list