Ticket #1315: madwifi-compat-0.9.3-2.6.22.patch

madwifi-0.9.3/ath/if_ath_pci.c

@@ -207 +207 @@
-
-        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;
-        }

madwifi-0.9.3/include/compat.h

@@ -130 +130 @@
-#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_ */

madwifi-0.9.3/net80211/ieee80211_input.c

@@ -1039 +1039 @@
-                         * incoming fragments
-                         * XXX 4-address/QoS frames?
-                         */
-skb->end - skb->head < ni->ni_vap->iv_dev->mtu +
-hdrlen
+(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) -
-
+
+
-                                dev_kfree_skb(skb);
-                        }
-                }
@@ -1057 +1058 @@
-                         * we've verified that before
-                         */
-                        /* Copy current fragment at end of previous one */
-ni->ni_rxfrag->tail
+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 +1128 @@
-                }
-                if (skb1 != NULL) {
-                        skb1->dev = dev;
-
-
+
+
+
+
-                        skb1->protocol = __constant_htons(ETH_P_802_2);
-                        /* XXX insert vlan tag before queue it? */
-                        dev_queue_xmit(skb1);
@@ -2250 +2253 @@
-                if (skb1 == NULL)
-                        return;
-                skb1->dev = dev;
-
+
+
-                skb1->ip_summed = CHECKSUM_NONE;
-                skb1->pkt_type = PACKET_OTHERHOST;
-                skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
@@ -2525 +2529 @@
-        
-        skb->dev = dev;
-        skb->protocol = eth_type_trans(skb, dev);
-
+
+
-        ieee80211_deliver_data(ni, skb);
-        return;
-}
@@ -3691 +3696 @@
-{
-        struct ethhdr *eth;
-        
-->mac.raw=skb->data
+_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.
-         */
-->mac.raw
+_mac_header(skb)
-        
-        if (*eth->h_dest & 1)
-                if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)

madwifi-0.9.3/net80211/ieee80211_monitor.c

@@ -373 +373 @@
-                if (vap->iv_monitor_txf_len && tx) {
-                        /* truncate transmit feedback packets */
-                        skb_trim(skb1, vap->iv_monitor_txf_len);
-1->nh.raw = skb1->data
+_reset_network_header(skb1)
-                }
-                switch (vap->iv_dev->type) {
-                case ARPHRD_IEEE80211:
@@ -555 +555 @@
-                                skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);
-                        }
-                        skb1->dev = dev; /* NB: deliver to wlanX */
-
+
+
-                        skb1->ip_summed = CHECKSUM_NONE;
-                        skb1->pkt_type = pkttype;
-                        skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */

madwifi-0.9.3/patches/2.6/Kconfig

@@ -3 +3 @@
-
-config ATHEROS
-        tristate "Atheros PCI/Cardbus cards"
-NET_RADIO
+(NET_RADIO || WIRELESS_EXT)
-       ---help---
-          Say Y here if you intend to attach an Atheros Cardbus or PCI
-          wireless Ethernet networking card to your computer.  This