From: Luis R. Rodriguez Date: Wed, 27 Jul 2011 22:29:28 +0000 (-0700) Subject: compat-wireless: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=72e6376b5750ea275897d2084a168bc3099ee32b;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index e9ab3bddd9fc..244e03eb88f6 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -228,7 +228,7 @@ without creating a headache on maintenance of the pathes. dev->flags |= IFF_BROADCAST | IFF_MULTICAST; --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c -@@ -985,7 +985,7 @@ +@@ -985,7 +985,7 @@ static int lbs_add_mesh(struct lbs_priva mesh_dev->ml_priv = priv; priv->mesh_dev = mesh_dev; diff --git a/patches/04-netns.patch b/patches/04-netns.patch index d49c2d385b0b..14c679b2a3f3 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 -@@ -4700,7 +4700,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4714,7 +4714,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")) { -@@ -982,6 +988,7 @@ static struct notifier_block cfg80211_ne +@@ -983,6 +989,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; -@@ -999,14 +1006,17 @@ static void __net_exit cfg80211_pernet_e +@@ -1000,14 +1007,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) -@@ -1041,8 +1051,10 @@ out_fail_nl80211: +@@ -1042,8 +1052,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -1054,7 +1066,9 @@ static void __exit cfg80211_exit(void) +@@ -1055,7 +1067,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 fc98213630e2..dbfd6e6ac6f4 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 -@@ -1307,7 +1307,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1310,7 +1310,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/06-header-changes.patch b/patches/06-header-changes.patch index f311c406e801..9a2041f941bf 100644 --- a/patches/06-header-changes.patch +++ b/patches/06-header-changes.patch @@ -18,8 +18,8 @@ cases. --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c -@@ -28,6 +28,7 @@ - *****************************************************************************/ +@@ -30,6 +30,7 @@ + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index e806caf6efc4..244bc8b9778b 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/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c -@@ -2880,6 +2880,9 @@ static struct pci_error_handlers atl1c_e +@@ -2898,6 +2898,9 @@ static struct pci_error_handlers atl1c_e static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); @@ -19,7 +19,7 @@ calls on compat code with only slight modifications. static struct pci_driver atl1c_driver = { .name = atl1c_driver_name, .id_table = atl1c_pci_tbl, -@@ -2887,7 +2890,12 @@ static struct pci_driver atl1c_driver = +@@ -2905,7 +2908,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, @@ -34,7 +34,7 @@ calls on compat code with only slight modifications. /* --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c -@@ -2837,6 +2837,9 @@ static int atl1_resume(struct device *de +@@ -2836,6 +2836,9 @@ static int atl1_resume(struct device *de return 0; } @@ -44,7 +44,7 @@ calls on compat code with only slight modifications. static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); #define ATL1_PM_OPS (&atl1_pm_ops) -@@ -3104,7 +3107,12 @@ static struct pci_driver atl1_driver = { +@@ -3105,7 +3108,12 @@ static struct pci_driver atl1_driver = { .probe = atl1_probe, .remove = __devexit_p(atl1_remove), .shutdown = atl1_shutdown, @@ -219,7 +219,7 @@ calls on compat code with only slight modifications. static int __init iwl4965_init(void) --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c -@@ -528,6 +528,9 @@ static int iwl_pci_resume(struct device +@@ -537,6 +537,9 @@ static int iwl_pci_resume(struct device static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); @@ -229,7 +229,7 @@ calls on compat code with only slight modifications. #define IWL_PM_OPS (&iwl_dev_pm_ops) #else -@@ -541,7 +544,12 @@ static struct pci_driver iwl_pci_driver +@@ -550,7 +553,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/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index e94074593a11..6cc2b8a82efd 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -45,7 +45,7 @@ suspend and resume that are not backported. for (i = 0; i < adapter->priv_num; i++) if ((GET_BSS_ROLE(adapter->priv[i]) == -@@ -144,6 +146,7 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -147,6 +149,7 @@ mwifiex_sdio_remove(struct sdio_func *fu kfree(card); } @@ -53,7 +53,7 @@ suspend and resume that are not backported. /* * SDIO suspend. * -@@ -251,6 +254,7 @@ static int mwifiex_sdio_resume(struct de +@@ -254,6 +257,7 @@ static int mwifiex_sdio_resume(struct de return 0; } @@ -61,7 +61,7 @@ suspend and resume that are not backported. /* Device ID for SD8787 */ #define SDIO_DEVICE_ID_MARVELL_8787 (0x9119) -@@ -263,10 +267,12 @@ static const struct sdio_device_id mwifi +@@ -266,10 +270,12 @@ static const struct sdio_device_id mwifi MODULE_DEVICE_TABLE(sdio, mwifiex_ids); @@ -74,7 +74,7 @@ suspend and resume that are not backported. static struct sdio_driver mwifiex_sdio = { .name = "mwifiex_sdio", -@@ -275,7 +281,9 @@ static struct sdio_driver mwifiex_sdio = +@@ -278,7 +284,9 @@ static struct sdio_driver mwifiex_sdio = .remove = mwifiex_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index a37886ba44da..4b03abd3688a 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 -@@ -1513,7 +1513,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1514,7 +1514,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/41-no-kfree-rcu.patch b/patches/41-no-kfree-rcu.patch index 1c50d380f91e..c18b50d5e286 100644 --- a/patches/41-no-kfree-rcu.patch +++ b/patches/41-no-kfree-rcu.patch @@ -55,7 +55,7 @@ spin_unlock_bh(&sta->lock); --- a/net/mac80211/work.c +++ b/net/mac80211/work.c -@@ -65,10 +65,25 @@ static void run_again(struct ieee80211_l +@@ -66,10 +66,25 @@ static void run_again(struct ieee80211_l mod_timer(&local->work_timer, timeout); } diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch index 5a35a3a1ddd1..45e4217cc7b3 100644 --- a/patches/42-netlink_seq.patch +++ b/patches/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -3767,7 +3767,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -3794,7 +3794,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch index 2d5af48d2440..4767d7d40440 100644 --- a/patches/99-change-makefiles.patch +++ b/patches/99-change-makefiles.patch @@ -5,12 +5,14 @@ only the wireless stuff. --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile -@@ -1,5 +1 @@ +@@ -1,7 +1,3 @@ -obj-$(CONFIG_EEPROM_AT24) += at24.o -obj-$(CONFIG_EEPROM_AT25) += at25.o -obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o -obj-$(CONFIG_EEPROM_MAX6875) += max6875.o obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o + obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o + obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -2,31 +2,7 @@