From d4c0ad3cc2d61b0718c1e32b1388c489f64fbf0d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 10 Nov 2010 14:57:12 -0800 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 4 ++-- patches/05-usb.patch | 2 +- patches/09-threaded-irq.patch | 2 +- patches/14-device-type.patch | 2 +- patches/19-kfifo.patch | 4 ++-- patches/25-multicast-list_head.patch | 4 ++-- patches/26-sdio-quirks.patch | 4 ++-- patches/29-libertas_sdio_no_suspend.patch | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 30f3169edbab..abdd2864b4e2 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes. if (unlikely(retval < 0)) { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1332,7 +1332,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1343,7 +1343,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -228,7 +228,7 @@ without creating a headache on maintenance of the pathes. wdev->netdev = ndev; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -824,7 +824,7 @@ struct lbs_private *lbs_add_card(void *c +@@ -831,7 +831,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; diff --git a/patches/05-usb.patch b/patches/05-usb.patch index 66f6d9842b81..71b65d5104ab 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27. static int __init p54u_init(void) --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1066,7 +1066,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1065,7 +1065,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids, diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 4501d7aae439..c75bbcb4dea1 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -51,7 +51,7 @@ thread in process context as well. b43_release_firmware(dev); --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -757,6 +757,9 @@ struct b43_wldev { +@@ -770,6 +770,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index 0f36773f0b75..98bcd8ef0956 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -36,7 +36,7 @@ compile warning. { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1255,13 +1255,17 @@ static const struct net_device_ops usbne +@@ -1256,13 +1256,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch index a472e65e9d18..f0e7f59ce158 100644 --- a/patches/19-kfifo.patch +++ b/patches/19-kfifo.patch @@ -3,7 +3,7 @@ not be backported easily with defines in the compat module. --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h -@@ -120,7 +120,11 @@ struct lbs_private { +@@ -121,7 +121,11 @@ struct lbs_private { u32 resp_len[2]; /* Events sent from hardware to driver */ @@ -17,7 +17,7 @@ not be backported easily with defines in the compat module. struct task_struct *main_thread; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -746,8 +746,14 @@ static int lbs_init_adapter(struct lbs_p +@@ -753,8 +753,14 @@ static int lbs_init_adapter(struct lbs_p priv->resp_len[0] = priv->resp_len[1] = 0; /* Create the event FIFO */ diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index a35299e82b18..aa6fc2a7df9f 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -255,7 +255,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -242,18 +242,34 @@ static int lbs_add_mcast_addrs(struct cm +@@ -249,18 +249,34 @@ static int lbs_add_mcast_addrs(struct cm netif_addr_lock_bh(dev); cnt = netdev_mc_count(dev); netdev_for_each_mc_addr(ha, dev) { @@ -678,7 +678,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -440,8 +440,13 @@ static void ieee80211_do_stop(struct iee +@@ -443,8 +443,13 @@ static void ieee80211_do_stop(struct iee netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); diff --git a/patches/26-sdio-quirks.patch b/patches/26-sdio-quirks.patch index d0ce1a07118e..a802a25ec038 100644 --- a/patches/26-sdio-quirks.patch +++ b/patches/26-sdio-quirks.patch @@ -2,7 +2,7 @@ The quirks attribute is not available on older kernels. --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -984,6 +984,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -1010,6 +1010,7 @@ static int if_sdio_probe(struct sdio_fun if (ret) goto disable; @@ -10,7 +10,7 @@ The quirks attribute is not available on older kernels. /* For 1-bit transfers to the 8686 model, we need to enable the * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 * bit to allow access to non-vendor registers. */ -@@ -1002,6 +1003,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -1028,6 +1029,7 @@ static int if_sdio_probe(struct sdio_fun if (ret) goto release_int; } diff --git a/patches/29-libertas_sdio_no_suspend.patch b/patches/29-libertas_sdio_no_suspend.patch index 04d5b07bd0af..c6deb3354bc3 100644 --- a/patches/29-libertas_sdio_no_suspend.patch +++ b/patches/29-libertas_sdio_no_suspend.patch @@ -5,7 +5,7 @@ suspend and resume that are not backported. --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -1171,6 +1171,7 @@ static void if_sdio_remove(struct sdio_f +@@ -1197,6 +1197,7 @@ static void if_sdio_remove(struct sdio_f lbs_deb_leave(LBS_DEB_SDIO); } @@ -13,7 +13,7 @@ suspend and resume that are not backported. static int if_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1225,15 +1226,18 @@ static const struct dev_pm_ops if_sdio_p +@@ -1251,15 +1252,18 @@ static const struct dev_pm_ops if_sdio_p .suspend = if_sdio_suspend, .resume = if_sdio_resume, }; -- 2.30.2