Ticket #1315: madwifi-0.9.3_Linux-2.6.22-rc1.diff

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(dev->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/net80211/ieee80211_input.c

@@ -1127 +1127 @@
-                }
-                if (skb1 != NULL) {
-                        skb1->dev = dev;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+                        skb1->mac_header = skb1->data;
+                        skb1->network_header = skb1->data + sizeof(struct ether_header);
+#else
-                        skb1->mac.raw = skb1->data;
-                        skb1->nh.raw = skb1->data + sizeof(struct ether_header);
+#endif
+
-                        skb1->protocol = __constant_htons(ETH_P_802_2);
-                        /* XXX insert vlan tag before queue it? */
-                        dev_queue_xmit(skb1);
@@ -2250 +2257 @@
-                if (skb1 == NULL)
-                        return;
-                skb1->dev = dev;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+                skb1->mac_header = skb1->data;
+#else
-                skb1->mac.raw = skb1->data;
+#endif
+
-                skb1->ip_summed = CHECKSUM_NONE;
-                skb1->pkt_type = PACKET_OTHERHOST;
-                skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
@@ -2525 +2538 @@
-        
-        skb->dev = dev;
-        skb->protocol = eth_type_trans(skb, dev);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+        skb->mac_header = skb->data;
+#else
-        skb->mac.raw = skb->data;
+#endif
+
-        ieee80211_deliver_data(ni, skb);
-        return;
-}
@@ -3690 +3709 @@
-ath_eth_type_trans(struct sk_buff *skb, struct net_device *dev)
-{
-        struct ethhdr *eth;
-
-
+
+
+
+
+
+
+
-        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.
-         */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+        eth = (struct ethhdr *)skb->mac_header;
+#else
-        eth = (struct ethhdr *)skb->mac.raw;
+#endif
-        
-        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);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+                        skb1->network_header = skb1->data;
+#else
-                        skb1->nh.raw = skb1->data;
+#endif
+
-                }
-                switch (vap->iv_dev->type) {
-                case ARPHRD_IEEE80211:
@@ -555 +561 @@
-                                skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);
-                        }
-                        skb1->dev = dev; /* NB: deliver to wlanX */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+                        skb1->mac_header = skb1->data;
+#else
-                        skb1->mac.raw = skb1->data;
+#endif
+
-                        skb1->ip_summed = CHECKSUM_NONE;
-                        skb1->pkt_type = pkttype;
-                        skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */