From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 28 Dec 2012 21:05:57 +0000 (+0000)
Subject: mac80211: refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b41d96e8b7971905f891ef5ec1df1054bd1ca942;p=openwrt%2Fstaging%2Fblocktrron.git

mac80211: refresh patches

SVN-Revision: 34911
---

diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
index 7c5b141293..9897291322 100644
--- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
@@ -239,7 +239,7 @@
  	.get_entry_state	= rt2800pci_get_entry_state,
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1206,6 +1206,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+@@ -1214,6 +1214,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
  
  	rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
  
@@ -250,7 +250,7 @@
  	/*
  	 * Initialize work.
  	 */
-@@ -1330,6 +1334,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+@@ -1338,6 +1342,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
  	 */
  	if (rt2x00dev->drv_data)
  		kfree(rt2x00dev->drv_data);
diff --git a/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
index 2114af245b..83a8aae83b 100644
--- a/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
+++ b/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
@@ -12,7 +12,7 @@
  #endif /* _RT2X00_PLATFORM_H */
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -834,6 +834,22 @@ static int rt2x00lib_probe_hw_modes(stru
+@@ -842,6 +842,22 @@ static int rt2x00lib_probe_hw_modes(stru
  	unsigned int num_rates;
  	unsigned int i;
  
diff --git a/package/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/mac80211/patches/608-add_platform_data_mac_addr.patch
index 4c6e491e1d..2cfa7fbe42 100644
--- a/package/mac80211/patches/608-add_platform_data_mac_addr.patch
+++ b/package/mac80211/patches/608-add_platform_data_mac_addr.patch
@@ -10,7 +10,7 @@
  	int disable_5ghz;
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -825,6 +825,18 @@ static void rt2x00lib_rate(struct ieee80
+@@ -833,6 +833,18 @@ static void rt2x00lib_rate(struct ieee80
  		entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
  }