Ticket #1315: 141-Madwifi-fixes.patch

141-Madwifi-fixes.patch-old/drivers/net/wireless/madwifi/Kconfig

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

141-Madwifi-fixes.patch-old/drivers/net/wireless/madwifi/ath/if_ath_pci.c

@@ -207 +207 @@
-
-        pci_set_drvdata(pdev, dev);
-
-2
+1
-        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)) {

141-Madwifi-fixes.patch-old/drivers/net/wireless/madwifi/net80211/ieee80211_input.c

@@ -1047 +1047 @@
-                         * incoming fragments
-                         * XXX 4-address/QoS frames?
-                         */
-->end
+_end_pointer(skb)
-                                 hdrlen) {
-                                ni->ni_rxfrag = skb_copy_expand(skb, 0,
-                                        (ni->ni_vap->iv_dev->mtu + hdrlen) -
-->end
+_end_pointer(skb)
-                                dev_kfree_skb(skb);
-                        }
-                }
@@ -1065 +1065 @@
-                         * 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);
@@ -1136 +1136 @@
-                if (skb1 != NULL) {
-                        skb1->dev = dev;
-
-2
-1->mac_header = skb1->data
-1->network_header = skb1->data + sizeof(struct ether_header
+1
+_reset_mac_header(skb1)
+_set_network_header(skb1, sizeof(struct ether_header)
-#else
-                        skb1->mac.raw = skb1->data;
-                        skb1->nh.raw = skb1->data + sizeof(struct ether_header);
@@ -2270 +2270 @@
-                        return;
-                skb1->dev = dev;
-
-2
-1->mac_header = skb1->data
+1
+_reset_mac_header(skb1)
-#else
-                skb1->mac.raw = skb1->data;
-#endif
@@ -2554 +2554 @@
-        skb->pkt_type = PACKET_BROADCAST;
-        skb->protocol = htons(ETH_P_802_2);
- 
-2
-->mac_header = skb->data
+1
+_reset_mac_header(skb)
-#else
-        skb->mac.raw = skb->data;
-#endif
@@ -3730 +3730 @@
-{
-        struct ethhdr *eth;
-
-2
-->mac_header = skb->data
+1
+_reset_mac_header(skb)
-#else
-        skb->mac.raw = skb->data;
-#endif
@@ -3743 +3743 @@
-         *     no easy way to do this cleanly.
-         */
-
-2
-->mac_header
+1
+_mac_header(skb)
-#else
-        eth = (struct ethhdr *)skb->mac.raw;
-#endif

141-Madwifi-fixes.patch-old/drivers/net/wireless/madwifi/net80211/ieee80211_monitor.c

@@ -369 +369 @@
-                        /* truncate transmit feedback packets */
-                        skb_trim(skb1, vap->iv_monitor_txf_len);
-
-2
-1->network_header = skb1->data
+1
+_reset_network_header(skb1)
-#else
-                        skb1->nh.raw = skb1->data;
-#endif
@@ -562 +562 @@
-                        }
-                        skb1->dev = dev; /* NB: deliver to wlanX */
-
-2
-1->mac_header = skb1->data
+1
+_reset_mac_header(skb1)
-#else
-                        skb1->mac.raw = skb1->data;
-#endif