[package] mac80211: cleanup patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15392 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/510-b43-poison-rx-buffers.patch b/package/mac80211/patches/510-b43-poison-rx-buffers.patch
index c50df13..c1c6d79 100644 (file)
--- a/package/mac80211/patches/510-b43-poison-rx-buffers.patch
+++ b/package/mac80211/patches/510-b43-poison-rx-buffers.patch
@@ -23,10 +23,8 @@ Signed-off-by: Michael Buesch <mb@bu3sch.de>
 
 ---
 
 
 ---
 

-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/dma.c
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/dma.c     2009-04-06 18:52:25.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/dma.c  2009-04-06 18:52:30.000000000 +0200
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c

 @@ -555,11 +555,32 @@ address_error:
        return 1;
  }
 @@ -555,11 +555,32 @@ address_error:
        return 1;
  }

diff --git a/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch b/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch
index e72a61f..dfe7920 100644 (file)
--- a/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch
+++ b/package/mac80211/patches/511-b43-refresh-rx-poison-on-buffer-recycling.patch
@@ -7,10 +7,8 @@ Signed-off-by: Michael Buesch <mb@bu3sch.de>
 
 ---
 
 
 ---
 

-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/dma.c
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/dma.c     2009-04-06 18:52:30.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/dma.c  2009-04-06 18:53:04.000000000 +0200
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c

 @@ -1503,20 +1503,16 @@ static void dma_rx(struct b43_dmaring *r
                        len = le16_to_cpu(rxhdr->frame_len);
                } while (len == 0 && i++ < 5);
 @@ -1503,20 +1503,16 @@ static void dma_rx(struct b43_dmaring *r
                        len = le16_to_cpu(rxhdr->frame_len);
                } while (len == 0 && i++ < 5);

diff --git a/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch b/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch
index 6cc8ea9..0eef6bf 100644 (file)
--- a/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch
+++ b/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch
@@ -4,10 +4,8 @@ This patch is submitted upstream and can be removed when it hits compat-wireless
 
 
 
 
 
 

-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/b43.h     2009-04-06 18:52:21.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h  2009-04-06 18:53:19.000000000 +0200
+--- a/drivers/net/wireless/b43/b43.h
++++ b/drivers/net/wireless/b43/b43.h

 @@ -625,9 +625,11 @@ struct b43_wl {
        /* Stats about the wireless interface */
        struct ieee80211_low_level_stats ieee_stats;
 @@ -625,9 +625,11 @@ struct b43_wl {
        /* Stats about the wireless interface */
        struct ieee80211_low_level_stats ieee_stats;


@@ -21,11 +19,9 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h
  
        /* The RF-kill button */
        struct b43_rfkill rfkill;
  
        /* The RF-kill button */
        struct b43_rfkill rfkill;

-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/main.c    2009-04-06 18:52:28.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c 2009-04-06 18:53:19.000000000 +0200
-@@ -2982,6 +2982,7 @@ static void b43_security_init(struct b43
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -2980,6 +2980,7 @@ static void b43_security_init(struct b43

        b43_clear_keys(dev);
  }
  
        b43_clear_keys(dev);
  }
  


@@ -33,7 +29,7 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
  static int b43_rng_read(struct hwrng *rng, u32 *data)
  {
        struct b43_wl *wl = (struct b43_wl *)rng->priv;
  static int b43_rng_read(struct hwrng *rng, u32 *data)
  {
        struct b43_wl *wl = (struct b43_wl *)rng->priv;

-@@ -2997,17 +2998,21 @@ static int b43_rng_read(struct hwrng *rn
+@@ -2995,17 +2996,21 @@ static int b43_rng_read(struct hwrng *rn

  
        return (sizeof(u16));
  }
  
        return (sizeof(u16));
  }


@@ -56,7 +52,7 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
        snprintf(wl->rng_name, ARRAY_SIZE(wl->rng_name),
                 "%s_%s", KBUILD_MODNAME, wiphy_name(wl->hw->wiphy));
        wl->rng.name = wl->rng_name;
        snprintf(wl->rng_name, ARRAY_SIZE(wl->rng_name),
                 "%s_%s", KBUILD_MODNAME, wiphy_name(wl->hw->wiphy));
        wl->rng.name = wl->rng_name;

-@@ -3020,6 +3025,7 @@ static int b43_rng_init(struct b43_wl *w
+@@ -3018,6 +3023,7 @@ static int b43_rng_init(struct b43_wl *w

                b43err(wl, "Failed to register the random "
                       "number generator (%d)\n", err);
        }
                b43err(wl, "Failed to register the random "
                       "number generator (%d)\n", err);
        }


@@ -64,10 +60,8 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
  
        return err;
  }
  
        return err;
  }

-Index: compat-wireless-2009-03-31/config.mk
-===================================================================
---- compat-wireless-2009-03-31.orig/config.mk  2009-04-06 18:52:21.000000000 +0200
-+++ compat-wireless-2009-03-31/config.mk       2009-04-06 18:53:19.000000000 +0200
+--- a/config.mk
++++ b/config.mk

 @@ -148,6 +148,7 @@ CONFIG_ATH9K_DEBUG=y
  # CONFIG_B43_PIO=y
  # CONFIG_B43_LEDS=y
 @@ -148,6 +148,7 @@ CONFIG_ATH9K_DEBUG=y
  # CONFIG_B43_PIO=y
  # CONFIG_B43_LEDS=y

diff --git a/package/mac80211/patches/530-b43-optimize-hotpath-mmio.patch b/package/mac80211/patches/530-b43-optimize-hotpath-mmio.patch
index 3413731..9ea12f3 100644 (file)
--- a/package/mac80211/patches/530-b43-optimize-hotpath-mmio.patch
+++ b/package/mac80211/patches/530-b43-optimize-hotpath-mmio.patch
@@ -1,7 +1,5 @@
-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/b43.h     2009-04-08 20:27:37.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h  2009-04-08 20:28:14.000000000 +0200
+--- a/drivers/net/wireless/b43/b43.h
++++ b/drivers/net/wireless/b43/b43.h

 @@ -778,8 +778,8 @@ struct b43_wldev {
        /* Reason code of the last interrupt. */
        u32 irq_reason;
 @@ -778,8 +778,8 @@ struct b43_wldev {
        /* Reason code of the last interrupt. */
        u32 irq_reason;


@@ -13,10 +11,8 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h
        /* Link Quality calculation context. */
        struct b43_noise_calculation noisecalc;
        /* if > 0 MAC is suspended. if == 0 MAC is enabled. */
        /* Link Quality calculation context. */
        struct b43_noise_calculation noisecalc;
        /* if > 0 MAC is suspended. if == 0 MAC is enabled. */

-Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
-===================================================================
---- compat-wireless-2009-03-31.orig/drivers/net/wireless/b43/main.c    2009-04-08 20:22:24.000000000 +0200
-+++ compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c 2009-04-08 20:41:43.000000000 +0200
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c

 @@ -673,32 +673,6 @@ static void b43_short_slot_timing_disabl
        b43_set_slot_time(dev, 20);
  }
 @@ -673,32 +673,6 @@ static void b43_short_slot_timing_disabl
        b43_set_slot_time(dev, 20);
  }