From c39a6e2df9982338a4f2ae63a21a9fe8b20cd873 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 16 Aug 2010 16:29:52 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 6 +++--- patches/03-rfkill.patch | 2 +- patches/05-usb.patch | 2 +- patches/08-rename-iwl4965-config.patch | 2 +- patches/11-dev-pm-ops.patch | 4 ++-- patches/12-iw_handler-changes.patch | 2 +- patches/14-device-type.patch | 2 +- patches/19-kfifo.patch | 4 ++-- patches/25-multicast-list_head.patch | 8 ++++---- patches/31-backport-sk_add_backlog.patch | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 273405220555..ee29945073f5 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 -@@ -1322,7 +1322,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1332,7 +1332,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 -@@ -6122,7 +6122,7 @@ static struct net_device *ipw2100_alloc_ +@@ -6126,7 +6126,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -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 -@@ -823,7 +823,7 @@ struct lbs_private *lbs_add_card(void *c +@@ -824,7 +824,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index e1c82496da77..c59d72b8fbe8 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -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 -@@ -2194,7 +2194,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2197,7 +2197,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/patches/05-usb.patch b/patches/05-usb.patch index 459b127c21d8..a231b0f06040 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 -@@ -1043,7 +1043,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1039,7 +1039,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 7536c606041a..bcab068ea117 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -16,7 +16,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 -@@ -4248,10 +4248,10 @@ static void __devexit iwl_pci_remove(str +@@ -4205,10 +4205,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/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 688da8472185..69f2951bfede 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -9,7 +9,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -198,6 +198,33 @@ static void __devexit ath5k_pci_remove(s +@@ -199,6 +199,33 @@ static void __devexit ath5k_pci_remove(s #ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend(struct device *dev); static int ath5k_pci_resume(struct device *dev); @@ -43,7 +43,7 @@ calls on compat code with only slight modifications. static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); #define ATH5K_PM_OPS (&ath5k_pm_ops) -@@ -210,7 +237,12 @@ static struct pci_driver ath5k_pci_drive +@@ -211,7 +238,12 @@ static struct pci_driver ath5k_pci_drive .id_table = ath5k_pci_id_table, .probe = ath5k_pci_probe, .remove = __devexit_p(ath5k_pci_remove), diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch index 12d95bf8486f..2c4850d21bee 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 -@@ -6125,7 +6125,11 @@ static struct net_device *ipw2100_alloc_ +@@ -6129,7 +6129,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 a819c4d38566..97e88b6bdd20 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 -@@ -1245,13 +1245,17 @@ static const struct net_device_ops usbne +@@ -1255,13 +1255,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 680f2b4ea83d..2a97ca096306 100644 --- a/patches/19-kfifo.patch +++ b/patches/19-kfifo.patch @@ -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 -@@ -745,8 +745,14 @@ static int lbs_init_adapter(struct lbs_p +@@ -746,8 +746,14 @@ static int lbs_init_adapter(struct lbs_p priv->resp_len[0] = priv->resp_len[1] = 0; /* Create the event FIFO */ @@ -32,7 +32,7 @@ not be backported easily with defines in the compat module. lbs_pr_err("Out of memory allocating event FIFO buffer\n"); goto out; } -@@ -762,7 +768,12 @@ static void lbs_free_adapter(struct lbs_ +@@ -763,7 +769,12 @@ static void lbs_free_adapter(struct lbs_ lbs_deb_enter(LBS_DEB_MAIN); lbs_free_cmd_buffer(priv); diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index a4706cf0053e..524b9a64e3ea 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -262,7 +262,11 @@ static void ath5k_remove_interface(struc +@@ -263,7 +263,11 @@ static void ath5k_remove_interface(struc struct ieee80211_vif *vif); static int ath5k_config(struct ieee80211_hw *hw, u32 changed); static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -174,7 +174,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *new_flags, -@@ -3148,20 +3152,42 @@ unlock: +@@ -3169,20 +3173,42 @@ unlock: } static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -217,7 +217,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -3170,6 +3196,9 @@ static u64 ath5k_prepare_multicast(struc +@@ -3191,6 +3217,9 @@ static u64 ath5k_prepare_multicast(struc * neet to inform below to not reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ @@ -433,7 +433,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c -@@ -810,10 +810,19 @@ static void rtl8180_bss_info_changed(str +@@ -812,10 +812,19 @@ static void rtl8180_bss_info_changed(str } } diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch index ceb8d77b6195..1d2930e8838d 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 -@@ -4351,8 +4351,12 @@ static inline int l2cap_data_channel(str +@@ -4368,8 +4368,12 @@ static inline int l2cap_data_channel(str if (!sock_owned_by_user(sk)) { l2cap_ertm_data_rcv(sk, skb); } else { -- 2.30.2