From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Mon, 30 Apr 2012 18:54:31 +0000 (-0700)
Subject: compat-wireless: refresh patches for next-20120430
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0bc6f96e4cb6b125bf114bd6113bd994863e2ae4;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: refresh patches for next-20120430

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index ac58a1d60e8c..03a2a5a0154d 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -38,7 +38,7 @@ thread in process context as well.
  		if (err) {
  			b43err(dev->wl, "Cannot request IRQ-%d\n",
  			       dev->dev->irq);
-@@ -5040,6 +5053,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5046,6 +5059,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index e5ca197ba663..62281268ffb8 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -595,7 +595,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk = sock->sk;
  	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1064,8 +1071,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1067,8 +1074,12 @@ static struct sock *l2cap_sock_alloc(str
  	return sk;
  }
  
@@ -608,7 +608,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -1077,7 +1088,11 @@ static int l2cap_sock_create(struct net
+@@ -1080,7 +1091,11 @@ static int l2cap_sock_create(struct net
  			sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
  		return -ESOCKTNOSUPPORT;
  
diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index d7574d080cb4..8a0d936391e4 100644
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -106,9 +106,9 @@ suspend and resume that are not backported.
  }
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
  
- /* Device ID for SD8787 */
- #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
-@@ -269,10 +273,12 @@ static const struct sdio_device_id mwifi
+ /* Device ID for SD8786 */
+ #define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
+@@ -272,10 +276,12 @@ static const struct sdio_device_id mwifi
  
  MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
  
@@ -121,7 +121,7 @@ suspend and resume that are not backported.
  
  static struct sdio_driver mwifiex_sdio = {
  	.name = "mwifiex_sdio",
-@@ -281,7 +287,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -284,7 +290,9 @@ static struct sdio_driver mwifiex_sdio =
  	.remove = mwifiex_sdio_remove,
  	.drv = {
  		.owner = THIS_MODULE,
@@ -151,7 +151,7 @@ suspend and resume that are not backported.
  	int retry = 0;
  	while (atomic_read(&sdiodev->suspend) && retry++ != 30)
  		wait_event_timeout(*wq, false, HZ/100);
-@@ -540,7 +540,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct
  	}
  }
  
@@ -160,7 +160,7 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev)
  {
  	mmc_pm_flag_t sdio_flags;
-@@ -590,7 +590,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -596,7 +596,7 @@ static struct sdio_driver brcmf_sdmmc_dr
  	.remove = brcmf_ops_sdio_remove,
  	.name = "brcmfmac",
  	.id_table = brcmf_sdmmc_ids,