From 15ec87b3e4de19c0edd2541fc3e610cc7b7f9ec0 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 5 Jan 2011 17:03:05 -0800 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 14 +++++++------- patches/04-netns.patch | 10 +++++----- patches/05-usb.patch | 2 +- patches/08-rename-iwl4965-config.patch | 4 ++-- patches/09-threaded-irq.patch | 8 ++++---- patches/11-dev-pm-ops.patch | 4 ++-- patches/15-symbol-export-conflicts.patch | 2 +- patches/16-bluetooth.patch | 4 ++-- patches/17-netdev-queue.patch | 4 ++-- patches/19-kfifo.patch | 4 ++-- patches/22-multiqueue.patch | 4 ++-- patches/25-multicast-list_head.patch | 2 +- patches/30-bridge-port.patch | 2 +- patches/36-workqueue.patch | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 64b5fbd3dccd..8d1fd52e475d 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3297,7 +3297,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3437,7 +3437,7 @@ static int rndis_wlan_bind(struct usbnet * rndis_host wants to avoid all OID as much as possible * so do promisc/multicast handling in rndis_wlan. */ @@ -45,7 +45,7 @@ without creating a headache on maintenance of the pathes. retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp, --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -689,7 +689,12 @@ static const struct net_device_ops ieee8 +@@ -691,7 +691,12 @@ static const struct net_device_ops ieee8 static void ieee80211_if_setup(struct net_device *dev) { ether_setup(dev); @@ -59,7 +59,7 @@ without creating a headache on maintenance of the pathes. dev->destructor = free_netdev; } -@@ -836,7 +841,7 @@ static void ieee80211_setup_sdata(struct +@@ -838,7 +843,7 @@ static void ieee80211_setup_sdata(struct /* and set some type-dependent values */ sdata->vif.type = type; sdata->vif.p2p = false; @@ -68,7 +68,7 @@ without creating a headache on maintenance of the pathes. sdata->wdev.iftype = type; sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE); -@@ -875,7 +880,7 @@ static void ieee80211_setup_sdata(struct +@@ -877,7 +882,7 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -77,7 +77,7 @@ without creating a headache on maintenance of the pathes. sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -1126,6 +1131,8 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1128,6 +1133,8 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -86,7 +86,7 @@ without creating a headache on maintenance of the pathes. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1134,6 +1141,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1136,6 +1143,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; @@ -325,7 +325,7 @@ without creating a headache on maintenance of the pathes. atl1e_set_ethtool_ops(netdev); --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c -@@ -2608,7 +2608,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2599,7 +2599,7 @@ static int atl1c_init_netdev(struct net_ pci_set_drvdata(pdev, netdev); netdev->irq = pdev->irq; diff --git a/patches/04-netns.patch b/patches/04-netns.patch index e66e237cb2b5..a6128b9c6f4c 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4149,7 +4149,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4201,7 +4201,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -852,6 +858,7 @@ static struct notifier_block cfg80211_ne +@@ -862,6 +868,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -63,7 +63,7 @@ files... static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -869,14 +876,17 @@ static void __net_exit cfg80211_pernet_e +@@ -879,14 +886,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -81,7 +81,7 @@ files... err = wiphy_sysfs_init(); if (err) -@@ -911,8 +921,10 @@ out_fail_nl80211: +@@ -921,8 +931,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -924,7 +936,9 @@ static void __exit cfg80211_exit(void) +@@ -934,7 +946,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/05-usb.patch b/patches/05-usb.patch index 03aa1be486a9..9384af08a2da 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 -@@ -1074,7 +1074,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1106,7 +1106,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/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index c4a94d992add..9bd3bb88c515 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -39,7 +39,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-6000.o --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -3962,7 +3962,7 @@ static int iwl_pci_probe(struct pci_dev +@@ -3964,7 +3964,7 @@ static int iwl_pci_probe(struct pci_dev #ifdef CONFIG_IWL5000 iwlagn_hw_ops.hw_scan = NULL; #endif @@ -48,7 +48,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwl4965_hw_ops.hw_scan = NULL; #endif } -@@ -4336,10 +4336,10 @@ static void __devexit iwl_pci_remove(str +@@ -4338,10 +4338,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/09-threaded-irq.patch b/patches/09-threaded-irq.patch index a0a55afc2185..059e58e2c3ba 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -6,7 +6,7 @@ thread in process context as well. --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -3948,8 +3948,13 @@ redo: +@@ -3954,8 +3954,13 @@ redo: if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) { b43_sdio_free_irq(dev); } else { @@ -20,7 +20,7 @@ thread in process context as well. } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -3989,9 +3994,17 @@ static int b43_wireless_core_start(struc +@@ -3995,9 +4000,17 @@ static int b43_wireless_core_start(struc goto out; } } else { @@ -38,7 +38,7 @@ thread in process context as well. if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq); goto out; -@@ -4720,6 +4733,10 @@ static int b43_setup_bands(struct b43_wl +@@ -4726,6 +4739,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { @@ -63,7 +63,7 @@ thread in process context as well. /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -914,6 +914,10 @@ struct rt2x00_dev { +@@ -901,6 +901,10 @@ struct rt2x00_dev { * Tasklet for processing tx status reports (rt2800pci). */ struct tasklet_struct txstatus_tasklet; diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 4aa257f10604..a3914ce0acc5 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -94,7 +94,7 @@ calls on compat code with only slight modifications. int ath_pci_init(void) --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -4495,7 +4495,12 @@ static struct pci_driver iwl_driver = { +@@ -4497,7 +4497,12 @@ static struct pci_driver iwl_driver = { .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = __devexit_p(iwl_pci_remove), @@ -136,7 +136,7 @@ calls on compat code with only slight modifications. #endif /* CONFIG_PM */ --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h -@@ -635,7 +635,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr +@@ -634,7 +634,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr #ifdef CONFIG_PM int iwl_pci_suspend(struct device *device); int iwl_pci_resume(struct device *device); diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 661652dd6a41..1806ca0fa46a 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2933,7 +2933,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2916,7 +2916,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 6c0e13b3e7ac..6a9090fe8273 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -99,7 +99,7 @@ here still, but for now we keep this here. #include --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -598,7 +598,11 @@ drop: +@@ -601,7 +601,11 @@ drop: goto done; } @@ -111,7 +111,7 @@ here still, but for now we keep this here. { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -753,8 +757,12 @@ static struct proto hci_sk_proto = { +@@ -756,8 +760,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index 732f525917a4..f7ae882a674b 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was: --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1220,6 +1220,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -1222,6 +1222,7 @@ void ieee80211_if_remove(struct ieee8021 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -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; -@@ -1236,6 +1237,22 @@ void ieee80211_remove_interfaces(struct +@@ -1238,6 +1239,22 @@ void ieee80211_remove_interfaces(struct mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); } diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch index 9f352bf06d34..d9d25eee02aa 100644 --- a/patches/19-kfifo.patch +++ b/patches/19-kfifo.patch @@ -34,7 +34,7 @@ not be backported easily with defines in the compat module. } --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -822,10 +822,16 @@ static int rt2x00lib_probe_hw(struct rt2 +@@ -808,10 +808,16 @@ static int rt2x00lib_probe_hw(struct rt2 * queues gets reported before we've got a chance to handle * them) 24*4=384 tx status reports need to be cached. */ @@ -50,4 +50,4 @@ not be backported easily with defines in the compat module. +#endif /* tasklet for processing the tx status reports. */ - tasklet_init(&rt2x00dev->txstatus_tasklet, + if (rt2x00dev->ops->lib->txstatus_tasklet) diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index d4b9cf54f462..f367d2947134 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1642,6 +1642,10 @@ static void ieee80211_xmit(struct ieee80 +@@ -1647,6 +1647,10 @@ static void ieee80211_xmit(struct ieee80 return; } @@ -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(); -@@ -2129,7 +2133,14 @@ void ieee80211_tx_pending(unsigned long +@@ -2139,7 +2143,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/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 3d8632ee88e4..bee189d3a427 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -677,7 +677,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -734,7 +734,12 @@ struct ieee80211_local { +@@ -736,7 +736,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index 178f4c7fb5c5..a378b3752100 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-wireless. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1354,7 +1354,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1362,7 +1362,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch index 63f4b95fc13f..90d241245a80 100644 --- a/patches/36-workqueue.patch +++ b/patches/36-workqueue.patch @@ -2,7 +2,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -765,7 +765,11 @@ int ieee80211_register_hw(struct ieee802 +@@ -773,7 +773,11 @@ int ieee80211_register_hw(struct ieee802 hw->queues = IEEE80211_MAX_QUEUES; local->workqueue = @@ -14,7 +14,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a if (!local->workqueue) { result = -ENOMEM; goto fail_workqueue; -@@ -979,6 +983,10 @@ static void __exit ieee80211_exit(void) +@@ -988,6 +992,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); -- 2.30.2