From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 27 Jan 2013 21:15:48 +0000 (+0000)
Subject: acx-mac80211: refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2c0e5f83dbc85b9425b063f48d1de600abcc6f15;p=openwrt%2Fstaging%2Fadrian.git

acx-mac80211: refresh patches

SVN-Revision: 35333
---

diff --git a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
index 3b1afee412..707ba8bb4b 100644
--- a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
+++ b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
@@ -1,6 +1,6 @@
 --- a/main.h
 +++ b/main.h
-@@ -44,8 +44,11 @@ void acx_process_rxbuf(acx_device_t *ade
+@@ -44,8 +44,11 @@ int acx_e_op_get_tx_stats(struct ieee802
  
  #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39)
  int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -15,7 +15,7 @@
  
 --- a/main.c
 +++ b/main.c
-@@ -1024,7 +1024,12 @@ out:
+@@ -1024,7 +1024,12 @@ int acx_e_op_get_tx_stats(struct ieee802
   * acx_compat, and hiding this #if/else.  OTOH, inclusion doesnt care
   * about old kernels
   */
diff --git a/package/acx-mac80211/patches/100-hw-queue-check-fix.patch b/package/acx-mac80211/patches/100-hw-queue-check-fix.patch
index 62f2998e85..73366f3423 100644
--- a/package/acx-mac80211/patches/100-hw-queue-check-fix.patch
+++ b/package/acx-mac80211/patches/100-hw-queue-check-fix.patch
@@ -1,6 +1,6 @@
 --- a/mem.c
 +++ b/mem.c
-@@ -2026,7 +2026,7 @@ static int __devinit acxmem_probe(struct
+@@ -2036,7 +2036,7 @@ static int acxmem_probe(struct platform_
  	 */
  	ieee->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
  					| BIT(NL80211_IFTYPE_ADHOC);
@@ -11,7 +11,7 @@
  	/* TODO: although in the original driver the maximum value was
 --- a/pci.c
 +++ b/pci.c
-@@ -1010,7 +1010,7 @@ static int __devinit acxpci_probe(struct
+@@ -1022,7 +1022,7 @@ static int acxpci_probe(struct pci_dev *
  			BIT(NL80211_IFTYPE_STATION) |
  			BIT(NL80211_IFTYPE_ADHOC) |
  			BIT(NL80211_IFTYPE_AP);
@@ -20,7 +20,7 @@
  	/* OW TODO Check if RTS/CTS threshold can be included here */
  
  	/* TODO: although in the original driver the maximum value was
-@@ -1682,7 +1682,7 @@ static __devinit int vlynq_probe(struct
+@@ -1691,7 +1691,7 @@ static int vlynq_probe(struct vlynq_devi
  			BIT(NL80211_IFTYPE_STATION)	|
  			BIT(NL80211_IFTYPE_ADHOC) |
  			BIT(NL80211_IFTYPE_AP);
@@ -31,7 +31,7 @@
  	 * TODO OW 20100615 This should into a common init code
 --- a/usb.c
 +++ b/usb.c
-@@ -1627,7 +1627,7 @@ acxusb_probe(struct usb_interface *intf,
+@@ -1624,7 +1624,7 @@ acxusb_probe(struct usb_interface *intf,
  	 */
  	ieee->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
  			| BIT(NL80211_IFTYPE_ADHOC);
diff --git a/package/acx-mac80211/patches/200-initial-macaddr.patch b/package/acx-mac80211/patches/200-initial-macaddr.patch
index 498c72dd85..cc82fecbb3 100644
--- a/package/acx-mac80211/patches/200-initial-macaddr.patch
+++ b/package/acx-mac80211/patches/200-initial-macaddr.patch
@@ -1,6 +1,6 @@
---- a/cardsetting.c	2012-07-03 16:21:25.934102662 -0700
-+++ b/cardsetting.c	2012-07-03 16:49:26.910438174 -0700
-@@ -710,12 +710,27 @@
+--- a/cardsetting.c
++++ b/cardsetting.c
+@@ -710,12 +710,27 @@ static int acx1xx_get_station_id(acx_dev
  	u8 stationID[4 + acx_ie_descs[ACX1xx_IE_DOT11_STATION_ID].len];
  	const u8 *paddr;
  	int i, res;