[package] mac80211: cleanup patches

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

1 files changed, 9 insertions, 15 deletions

diff --git a/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch b/package/mac80211/patches/520-b43-autodepend-on-hwrandom.patch
index 6cc8ea9212..0eef6bfdb1 100644
--- 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;
@@ -21,11 +19,9 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/b43.h
  
  	/* 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);
  }
  
@@ -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;
-@@ -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));
  }
@@ -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;
-@@ -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);
  	}
@@ -64,10 +60,8 @@ Index: compat-wireless-2009-03-31/drivers/net/wireless/b43/main.c
  
  	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