From 0372f806185cb94434aa8d2def1952362d621e4d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 9 Mar 2012 13:23:55 -0800 Subject: [PATCH] compat-wireless: refresh patches This runs: ./scripts/admin-update.sh refresh This refreshes all hunk offests automatically. Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 6 +++--- patches/03-rfkill.patch | 2 +- patches/09-threaded-irq.patch | 6 +++--- patches/11-dev-pm-ops.patch | 4 ++-- patches/12-iw_handler-changes.patch | 2 +- patches/14-device-type.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/16-bluetooth.patch | 8 ++++---- patches/25-multicast-list_head.patch | 18 +++++++++--------- patches/45-remove-platform-id-table.patch | 2 +- patches/46-use_other_workqueue.patch | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index e82f656a3e18..044df8e555de 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 -@@ -1375,7 +1375,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1377,7 +1377,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6105,7 +6105,7 @@ static struct net_device *ipw2100_alloc_ +@@ -6103,7 +6103,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -267,7 +267,7 @@ without creating a headache on maintenance of the pathes. #define LBS_DEB_LEAVE 0x00000002 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1239,7 +1239,7 @@ static const struct net_device_ops hwsim +@@ -1282,7 +1282,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index 8e1892bac052..a9022e00490c 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -55,7 +55,7 @@ This would do the policing from within mac80211. error = input_register_handle(handle); --- a/net/rfkill/core.c +++ b/net/rfkill/core.c -@@ -805,7 +805,7 @@ static int rfkill_resume(struct device * +@@ -806,7 +806,7 @@ static int rfkill_resume(struct device * } static struct class rfkill_class = { diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 5986a0894a2b..33a51b64b621 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -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/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -5439,14 +5439,25 @@ static int __devinit wl12xx_probe(struct +@@ -5493,14 +5493,25 @@ static int __devinit wl12xx_probe(struct platform_set_drvdata(pdev, wl); @@ -89,7 +89,7 @@ thread in process context as well. if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_hw; -@@ -5500,7 +5511,11 @@ out_bt_coex_state: +@@ -5554,7 +5565,11 @@ out_bt_coex_state: device_remove_file(wl->dev, &dev_attr_bt_coex_state); out_irq: @@ -101,7 +101,7 @@ thread in process context as well. out_free_hw: wl1271_free_hw(wl); -@@ -5518,7 +5533,12 @@ static int __devexit wl12xx_remove(struc +@@ -5572,7 +5587,12 @@ static int __devexit wl12xx_remove(struc disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index c43d94db55ea..5858391fb68b 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -217,7 +217,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c -@@ -361,6 +361,9 @@ static int iwl_pci_resume(struct device +@@ -352,6 +352,9 @@ static int iwl_pci_resume(struct device static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); @@ -227,7 +227,7 @@ calls on compat code with only slight modifications. #define IWL_PM_OPS (&iwl_dev_pm_ops) #else -@@ -374,7 +377,12 @@ static struct pci_driver iwl_pci_driver +@@ -365,7 +368,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = __devexit_p(iwl_pci_remove), diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch index 2da83820b328..5b22ef80d662 100644 --- a/patches/12-iw_handler-changes.patch +++ b/patches/12-iw_handler-changes.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6108,7 +6108,11 @@ static struct net_device *ipw2100_alloc_ +@@ -6106,7 +6106,11 @@ static struct net_device *ipw2100_alloc_ netdev_attach_ops(dev, &ipw2100_netdev_ops); dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index ac7935dd7577..52b9cd7f8577 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 -@@ -1290,13 +1290,17 @@ static const struct net_device_ops usbne +@@ -1292,13 +1292,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 4f5a01b69796..a18cc2f66bfb 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 -@@ -3103,7 +3103,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3112,7 +3112,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 c0bbc9897eec..896bf0d36e29 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -94,7 +94,7 @@ here still, but for now we keep this here. wake_up_process(session->task); --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -893,7 +893,11 @@ drop: +@@ -892,7 +892,11 @@ drop: goto done; } @@ -106,7 +106,7 @@ here still, but for now we keep this here. { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1065,8 +1069,12 @@ static struct proto hci_sk_proto = { +@@ -1064,8 +1068,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; @@ -605,7 +605,7 @@ here still, but for now we keep this here. { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1057,8 +1064,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1058,8 +1065,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -618,7 +618,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -1070,7 +1081,11 @@ static int l2cap_sock_create(struct net +@@ -1071,7 +1082,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index c84d413d5afd..549644cc5192 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -124,7 +124,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return mc_filter[0] | ((u64)(mc_filter[1]) << 32); --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c -@@ -312,20 +312,42 @@ ath5k_bss_info_changed(struct ieee80211_ +@@ -316,20 +316,42 @@ ath5k_bss_info_changed(struct ieee80211_ static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -167,7 +167,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -334,6 +356,9 @@ ath5k_prepare_multicast(struct ieee80211 +@@ -338,6 +360,9 @@ ath5k_prepare_multicast(struct ieee80211 * need to inform below not to reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ @@ -435,7 +435,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 size_t fw_name_len, u32 *hw_ver); --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c -@@ -362,11 +362,18 @@ out: +@@ -363,11 +363,18 @@ out: return ret; } @@ -454,7 +454,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 int i; BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != -@@ -376,12 +383,23 @@ static u64 p54_prepare_multicast(struct +@@ -377,12 +384,23 @@ static u64 p54_prepare_multicast(struct * Otherwise the firmware will drop it and ARP will no longer work. */ i = 1; @@ -516,7 +516,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8180_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1205,9 +1205,17 @@ static void rtl8187_bss_info_changed(str +@@ -1287,9 +1287,17 @@ static void rtl8187_bss_info_changed(str } static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev, @@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -2743,11 +2743,20 @@ struct wl1271_filter_params { +@@ -2748,11 +2748,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -2760,16 +2769,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2765,16 +2774,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2189,7 +2189,11 @@ struct ieee80211_ops { +@@ -2190,7 +2190,11 @@ struct ieee80211_ops { enum ieee80211_tx_sync_type type); u64 (*prepare_multicast)(struct ieee80211_hw *hw, @@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -811,7 +811,12 @@ struct ieee80211_local { +@@ -849,7 +849,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ diff --git a/patches/45-remove-platform-id-table.patch b/patches/45-remove-platform-id-table.patch index 86b8d6d550ba..1c283c4a4dfb 100644 --- a/patches/45-remove-platform-id-table.patch +++ b/patches/45-remove-platform-id-table.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -5577,16 +5577,20 @@ static int __devexit wl12xx_remove(struc +@@ -5631,16 +5631,20 @@ static int __devexit wl12xx_remove(struc return 0; } diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch index 7119ac443d35..5c465b0656b5 100644 --- a/patches/46-use_other_workqueue.patch +++ b/patches/46-use_other_workqueue.patch @@ -4,7 +4,7 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -1809,8 +1809,12 @@ int hci_register_dev(struct hci_dev *hde +@@ -1803,8 +1803,12 @@ int hci_register_dev(struct hci_dev *hde write_unlock(&hci_dev_list_lock); -- 2.30.2