- 4.9.207

[packages/kernel.git] / kernel-hostap.patch

diff --git a/kernel-hostap.patch b/kernel-hostap.patch
index e1447fc1a0f9b896d1e5dcdf7a68fed921b4b1a8..32f6c245f9c2a965088b1c44e7121e66a424fa5e 100644 (file)
--- a/kernel-hostap.patch
+++ b/kernel-hostap.patch
@@ -1,6 +1,6 @@
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c  2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c    2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c 2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c   2006-09-21 01:30:18.000000000 -0400
 @@ -69,6 +69,9 @@
        iface = netdev_priv(dev);
        local = iface->local;
@@ -19,20 +19,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c linux
        iface->stats.tx_packets++;
        iface->stats.tx_bytes += skb->len;
  
-@@ -404,8 +408,6 @@
-       }
- 
-       if (skb->len < 24) {
--              printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
--                     "(len=%d)\n", dev->name, skb->len);
-               ret = 0;
-               iface->stats.tx_dropped++;
-               goto fail;
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_cs.c.orig
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_cs.c.rej
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c        2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c  2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_hw.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_hw.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_hw.c       2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_hw.c 2006-09-21 01:30:18.000000000 -0400
 @@ -1005,6 +1005,35 @@
        return fid;
  }
@@ -99,10 +88,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.1
        local->func->reset_port = prism2_reset_port;
        local->func->schedule_reset = prism2_schedule_reset;
  #ifdef PRISM2_DOWNLOAD_SUPPORT
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_hw.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c     2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c       2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_ioctl.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_ioctl.c    2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_ioctl.c      2006-09-21 01:30:18.000000000 -0400
 @@ -1104,33 +1104,7 @@
  
        printk(KERN_DEBUG "Enabling monitor mode\n");
@@ -147,9 +135,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.
        else if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
                 !local->fw_encrypt_ok) {
                printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_main.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c      2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_main.c        2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_main.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_main.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_main.c     2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_main.c       2006-09-21 01:30:18.000000000 -0400
 @@ -331,7 +331,7 @@
        if (local->iw_mode == IW_MODE_REPEAT)
                return HFA384X_PORTTYPE_WDS;
@@ -159,10 +147,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c linux-2.6
        return HFA384X_PORTTYPE_HOSTAP;
  }
  
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_main.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_pci.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c       2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_pci.c 2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_pci.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_pci.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_pci.c      2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_pci.c        2006-09-21 01:30:18.000000000 -0400
 @@ -48,6 +48,8 @@
        { 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
        /* Samsung MagicLAN SWL-2210P */
@@ -172,10 +159,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c linux-2.6.
        { 0 }
  };
  
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_pci.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_plx.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c       2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_plx.c 2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_plx.c linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_plx.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_plx.c      2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_plx.c        2006-09-21 01:30:18.000000000 -0400
 @@ -101,6 +101,7 @@
        { 0xc250, 0x0002 } /* EMTAC A2424i */,
        { 0xd601, 0x0002 } /* Z-Com XI300 */,
@@ -184,10 +170,9 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c linux-2.6.
        { 0, 0}
  };
  
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_plx.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_wlan.h linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_wlan.h
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_wlan.h      2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_wlan.h        2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_wlan.h linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_wlan.h
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_wlan.h     2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_wlan.h       2006-09-21 01:30:18.000000000 -0400
 @@ -575,6 +575,7 @@
        int (*hw_config)(struct net_device *dev, int initial);
        void (*hw_reset)(struct net_device *dev);