Changeset 2339

Timestamp:

05/15/07 22:46:14 (2 years ago)

Author:

mentor

Message:

Changes to compile against Linux 2.6.22.

Signed-off-by: GrimRC (Eugene St Leger) <grimrc@yahoo.com>

Files:

• trunk/ath/if_ath_pci.c (modified) (1 diff)
• trunk/net80211/ieee80211_input.c (modified) (5 diffs)
• trunk/net80211/ieee80211_monitor.c (modified) (2 diffs)

trunk/ath/if_ath_pci.c

@@ -208 +208 @@
-        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;

trunk/net80211/ieee80211_input.c

@@ -1136 +1136 @@
-                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? */
@@ -2263 +2270 @@
-                        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;
@@ -2541 +2554 @@
-        skb->pkt_type = PACKET_BROADCAST;
-        skb->protocol = htons(ETH_P_802_2);
+ 
+#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;
@@ -3711 +3730 @@
-{
-        struct ethhdr *eth;
-
-
+
+
+
+
+
+
+
-        skb_pull(skb, ETH_HLEN);
-        /*
@@ -3719 +3743 @@
-         *     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)

trunk/net80211/ieee80211_monitor.c

@@ -369 +369 @@
-                        /* 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) {
@@ -556 +562 @@
-                        }
-                        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;