From a0957031fb15b56c29976bca066d6130feff24f9 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 22 Oct 2010 19:24:14 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/03-rfkill.patch | 4 ++-- patches/08-rename-iwl4965-config.patch | 4 ++-- patches/16-bluetooth.patch | 6 +++--- patches/17-netdev-queue.patch | 2 +- patches/20-pcidev.patch | 2 +- patches/22-multiqueue.patch | 2 +- patches/24-pcmcia.patch | 8 ++++---- patches/25-multicast-list_head.patch | 2 +- patches/26-sdio-quirks.patch | 4 ++-- patches/29-libertas_sdio_no_suspend.patch | 4 ++-- patches/31-backport-sk_add_backlog.patch | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index ea3d7e6a3c94..0ac3758697a2 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -110,7 +110,7 @@ This would do the policing from within mac80211. .dev_release = rfkill_release, .dev_attrs = rfkill_dev_attrs, .dev_uevent = rfkill_dev_uevent, -@@ -965,7 +965,7 @@ int __must_check rfkill_register(struct +@@ -965,7 +965,7 @@ int __must_check rfkill_register(struct if (!rfkill->persistent || rfkill_epo_lock_active) { schedule_work(&rfkill->sync_work); } else { @@ -208,7 +208,7 @@ This would do the policing from within mac80211. #include --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1898,7 +1898,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -1872,7 +1872,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index bdcb5553faab..46d8bf90d5fb 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -23,7 +23,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o iwlcore-objs += iwl-scan.o iwl-led.o @@ -15,7 +15,7 @@ iwlagn-objs += iwl-agn-lib.o iwl-agn-rx - iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o + iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o -iwlagn-$(CONFIG_IWL4965) += iwl-4965.o @@ -33,7 +33,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-1000.o --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -4660,10 +4660,10 @@ static void __devexit iwl_pci_remove(str +@@ -4659,10 +4659,10 @@ static void __devexit iwl_pci_remove(str /* Hardware specific file defines the PCI IDs table for that hardware module */ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index e58ccc69bdf6..a1820a6be220 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -56,7 +56,7 @@ here still, but for now we keep this here. bt_sock_reclassify_lock(sock, proto); module_put(bt_proto[proto]->owner); } -@@ -445,7 +457,11 @@ int bt_sock_ioctl(struct socket *sock, u +@@ -445,7 +453,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; @@ -138,7 +138,7 @@ here still, but for now we keep this here. &bt_link_group, NULL }; -@@ -127,7 +131,11 @@ static void del_conn(struct work_struct +@@ -127,7 +131,11 @@ static void del_conn(struct work_struct dev = device_find_child(&conn->dev, NULL, __match_tty); if (!dev) break; @@ -562,7 +562,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -970,7 +974,11 @@ static int l2cap_sock_create(struct net +@@ -970,7 +974,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index 5e4ebe10980f..84260f6a7f98 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1268,6 +1269,22 @@ void ieee80211_remove_interfaces(struct +@@ -1268,6 +1269,22 @@ void ieee80211_remove_interfaces(struct mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); } diff --git a/patches/20-pcidev.patch b/patches/20-pcidev.patch index e892dcccd2f9..098765ce69c2 100644 --- a/patches/20-pcidev.patch +++ b/patches/20-pcidev.patch @@ -4,7 +4,7 @@ compat_is_pcie() when needed. --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -80,7 +80,11 @@ static void ath_pci_bt_coex_prep(struct +@@ -80,7 +80,11 @@ static void ath_pci_bt_coex_prep(struct struct pci_dev *pdev = to_pci_dev(sc->dev); u8 aspm; diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 57bba2bc368a..60e360ac970f 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() ieee80211_set_qos_hdr(local, skb); ieee80211_tx(sdata, skb, false); rcu_read_unlock(); -@@ -2096,7 +2100,14 @@ void ieee80211_tx_pending(unsigned long +@@ -2096,7 +2100,14 @@ void ieee80211_tx_pending(unsigned long if (skb_queue_empty(&local->pending[i])) list_for_each_entry_rcu(sdata, &local->interfaces, list) diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch index 4e1aedb107a5..f04e708c215f 100644 --- a/patches/24-pcmcia.patch +++ b/patches/24-pcmcia.patch @@ -395,7 +395,7 @@ do { info->hdev->stat.byte_rx++; -@@ -296,7 +304,11 @@ static irqreturn_t btuart_interrupt(int +@@ -296,7 +304,11 @@ static irqreturn_t btuart_interrupt(int /* our irq handler is shared */ return IRQ_NONE; @@ -1315,7 +1315,7 @@ static int spectrum_cs_config(struct pcmcia_device *link) -@@ -201,10 +304,12 @@ spectrum_cs_config(struct pcmcia_device +@@ -201,10 +304,12 @@ spectrum_cs_config(struct pcmcia_device int ret; void __iomem *mem; @@ -1328,7 +1328,7 @@ ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); if (ret) { if (!ignore_cis_vcc) -@@ -214,15 +319,23 @@ spectrum_cs_config(struct pcmcia_device +@@ -214,15 +319,23 @@ spectrum_cs_config(struct pcmcia_device goto failed; } @@ -1352,7 +1352,7 @@ if (!mem) goto failed; -@@ -244,8 +357,16 @@ spectrum_cs_config(struct pcmcia_device +@@ -244,8 +357,16 @@ spectrum_cs_config(struct pcmcia_device } /* Register an interface with the stack */ diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 913e4add031c..c31574e5fc70 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -616,7 +616,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 unsigned int *total_flags, --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -102,8 +102,13 @@ static void bnep_net_set_mc_list(struct +@@ -102,8 +102,13 @@ static void bnep_net_set_mc_list(struct netdev_for_each_mc_addr(ha, dev) { if (i == BNEP_MAX_MULTICAST_FILTERS) break; diff --git a/patches/26-sdio-quirks.patch b/patches/26-sdio-quirks.patch index 603094623f44..d0ce1a07118e 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 -@@ -982,6 +982,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -984,6 +984,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. */ -@@ -1000,6 +1001,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -1002,6 +1003,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 fc29fbd4e01b..04d5b07bd0af 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 -@@ -1161,6 +1161,7 @@ static void if_sdio_remove(struct sdio_f +@@ -1171,6 +1171,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); -@@ -1215,15 +1216,18 @@ static const struct dev_pm_ops if_sdio_p +@@ -1225,15 +1226,18 @@ static const struct dev_pm_ops if_sdio_p .suspend = if_sdio_suspend, .resume = if_sdio_resume, }; diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch index 8d26d1a735e4..d16642b29d89 100644 --- a/patches/31-backport-sk_add_backlog.patch +++ b/patches/31-backport-sk_add_backlog.patch @@ -9,7 +9,7 @@ backlog. --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c -@@ -4364,8 +4364,12 @@ static inline int l2cap_data_channel(str +@@ -4385,8 +4385,12 @@ static inline int l2cap_data_channel(str if (!sock_owned_by_user(sk)) { l2cap_ertm_data_rcv(sk, skb); } else { -- 2.30.2