From 7f6d02986c569e4fdc040609fc9a40d2f1048b35 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 12 Mar 2013 18:08:16 -0700 Subject: [PATCH] compat-drivers: refresh patches for next-20130312 Signed-off-by: Luis R. Rodriguez --- .../drm/04-revert-prime-support.patch | 10 ++++----- .../network/0001-netdev_ops.patch | 14 ++++++------ .../network/0002-net-misc.patch | 2 +- ...0003-netdev-needed_headroom_tailroom.patch | 4 ++-- .../network/0005-netlink-portid.patch | 4 ++-- .../network/04-netns.patch | 12 +++++----- .../network/08-rename-config-options.patch | 2 +- .../network/09-cfg80211-wext-padding.patch | 2 +- .../network/09-threaded-irq.patch | 10 ++++----- .../10-add-wext-handlers-to-netdev.patch | 2 +- .../network/11-dev-pm-ops.patch | 8 +++---- .../network/15-symbol-export-conflicts.patch | 2 +- .../network/25-multicast-list_head.patch | 22 +++++++++---------- .../network/30-bridge-port.patch | 2 +- .../network/32-remove-ns-type.patch | 4 ++-- .../network/36-workqueue.patch | 2 +- .../network/40-netdev-hw-features.patch | 14 ++++++------ .../network/42-netlink_seq.patch | 2 +- .../network/46-use_other_workqueue.patch | 2 +- .../network/55-iwlwifi-msg-trace-fix.patch | 6 ++--- .../network/57-iwlwifi-debug-fix.patch | 2 +- .../network/67-ipv6-dev-list.patch | 2 +- .../network/69-wowlan-no-socket.patch | 2 +- 23 files changed, 66 insertions(+), 66 deletions(-) diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch index 11cd8c954bf0..d0883c0c630c 100644 --- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch +++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch @@ -120,7 +120,7 @@ not < 3.3.0. +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -373,8 +373,10 @@ static const struct file_operations rade +@@ -374,8 +374,10 @@ static const struct file_operations rade static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | @@ -133,7 +133,7 @@ not < 3.3.0. .dev_priv_size = 0, .load = radeon_driver_load_kms, .firstopen = radeon_driver_firstopen_kms, -@@ -409,6 +411,7 @@ static struct drm_driver kms_driver = { +@@ -410,6 +412,7 @@ static struct drm_driver kms_driver = { .dumb_destroy = radeon_mode_dumb_destroy, .fops = &radeon_driver_kms_fops, @@ -141,7 +141,7 @@ not < 3.3.0. .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, -@@ -418,6 +421,7 @@ static struct drm_driver kms_driver = { +@@ -419,6 +422,7 @@ static struct drm_driver kms_driver = { .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, .gem_prime_vmap = radeon_gem_prime_vmap, .gem_prime_vunmap = radeon_gem_prime_vunmap, @@ -282,7 +282,7 @@ not < 3.3.0. --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -1025,7 +1025,11 @@ static struct drm_driver driver = { +@@ -1036,7 +1036,11 @@ static struct drm_driver driver = { */ .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ @@ -294,7 +294,7 @@ not < 3.3.0. .load = i915_driver_load, .unload = i915_driver_unload, .open = i915_driver_open, -@@ -1048,10 +1052,12 @@ static struct drm_driver driver = { +@@ -1059,10 +1063,12 @@ static struct drm_driver driver = { .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch index 049acb659bda..1d94c43f5d0a 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch @@ -157,7 +157,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1688,7 +1688,7 @@ static const struct net_device_ops hwsim +@@ -1689,7 +1689,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { @@ -168,7 +168,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 dev->tx_queue_len = 0; --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -645,7 +645,7 @@ static const struct net_device_ops mwifi +@@ -654,7 +654,7 @@ static const struct net_device_ops mwifi void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { @@ -190,7 +190,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 } --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -2209,7 +2209,7 @@ static int atl1e_init_netdev(struct net_ +@@ -2207,7 +2207,7 @@ static int atl1e_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); @@ -223,7 +223,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c -@@ -1399,7 +1399,7 @@ static int atl2_probe(struct pci_dev *pd +@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pd atl2_setup_pcicmd(pdev); @@ -234,7 +234,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1009,7 +1009,7 @@ static void ieee80211_if_setup(struct ne +@@ -1007,7 +1007,7 @@ static void ieee80211_if_setup(struct ne { ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; @@ -243,7 +243,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 dev->destructor = free_netdev; } -@@ -1172,7 +1172,7 @@ static void ieee80211_setup_sdata(struct +@@ -1170,7 +1170,7 @@ static void ieee80211_setup_sdata(struct /* only monitor/p2p-device differ */ if (sdata->dev) { @@ -252,7 +252,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 sdata->dev->type = ARPHRD_ETHER; } -@@ -1210,7 +1210,7 @@ static void ieee80211_setup_sdata(struct +@@ -1208,7 +1208,7 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; diff --git a/patches/collateral-evolutions/network/0002-net-misc.patch b/patches/collateral-evolutions/network/0002-net-misc.patch index 511f1b0e0a87..9c19e3510942 100644 --- a/patches/collateral-evolutions/network/0002-net-misc.patch +++ b/patches/collateral-evolutions/network/0002-net-misc.patch @@ -22,7 +22,7 @@ compile tested against older kernels. * For RX we handle drivers that zero-pad to end-of-packet. --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1010,6 +1010,11 @@ static void ieee80211_if_setup(struct ne +@@ -1008,6 +1008,11 @@ static void ieee80211_if_setup(struct ne ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev_attach_ops(dev, &ieee80211_dataif_ops); diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch index 664d34454c13..7f17b8015cfa 100644 --- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch @@ -4,7 +4,7 @@ could be used. --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1510,6 +1510,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1508,6 +1508,7 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -12,7 +12,7 @@ could be used. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1518,6 +1519,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1516,6 +1517,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; diff --git a/patches/collateral-evolutions/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch index 1eaceb25471a..6ec8abf5ee00 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid.patch @@ -42,7 +42,7 @@ this one should other drivers / subsystem need this change. --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -2012,10 +2012,10 @@ static int hwsim_register_received_nl(st +@@ -2013,10 +2013,10 @@ static int hwsim_register_received_nl(st if (info == NULL) goto out; @@ -55,7 +55,7 @@ this one should other drivers / subsystem need this change. return 0; out: -@@ -2052,7 +2052,7 @@ static int mac80211_hwsim_netlink_notify +@@ -2053,7 +2053,7 @@ static int mac80211_hwsim_netlink_notify if (state != NETLINK_URELEASE) return NOTIFY_DONE; diff --git a/patches/collateral-evolutions/network/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch index 3bf80398a220..48585b52631a 100644 --- a/patches/collateral-evolutions/network/04-netns.patch +++ b/patches/collateral-evolutions/network/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6348,7 +6348,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -6727,7 +6727,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); @@ -44,7 +44,7 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -851,8 +855,10 @@ static int cfg80211_netdev_notifier_call +@@ -891,8 +895,10 @@ static int cfg80211_netdev_notifier_call wdev->identifier = ++rdev->wdev_id; list_add_rcu(&wdev->list, &rdev->wdev_list); rdev->devlist_generation++; @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -1042,6 +1048,7 @@ static struct notifier_block cfg80211_ne +@@ -1051,6 +1057,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; -@@ -1059,14 +1066,17 @@ static void __net_exit cfg80211_pernet_e +@@ -1068,14 +1075,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) -@@ -1101,8 +1111,10 @@ out_fail_nl80211: +@@ -1110,8 +1120,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -1114,7 +1126,9 @@ static void __exit cfg80211_exit(void) +@@ -1123,7 +1135,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch index 56f40154a177..c2ce7b73097e 100644 --- a/patches/collateral-evolutions/network/08-rename-config-options.patch +++ b/patches/collateral-evolutions/network/08-rename-config-options.patch @@ -57,7 +57,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1352,7 +1352,7 @@ struct il_priv { +@@ -1348,7 +1348,7 @@ struct il_priv { } _3945; #endif diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch index 4ac78f30ba0c..d87ec13effa3 100644 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch @@ -30,7 +30,7 @@ moved due to struct enlargements. --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2500,6 +2500,9 @@ struct wiphy_wowlan_support { +@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/collateral-evolutions/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch index f83b8f3c5c21..8bc51978ad7b 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq.patch @@ -75,7 +75,7 @@ thread in process context as well. /** --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -759,12 +759,21 @@ void iwl_trans_pcie_free(struct iwl_tran +@@ -760,12 +760,21 @@ void iwl_trans_pcie_free(struct iwl_tran { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -97,7 +97,7 @@ thread in process context as well. iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1570,9 +1579,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1553,9 +1562,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; @@ -116,7 +116,7 @@ thread in process context as well. } --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -5994,14 +5994,25 @@ static void wlcore_nvs_cb(const struct f +@@ -5995,14 +5995,25 @@ static void wlcore_nvs_cb(const struct f wl->platform_quirks = pdata->platform_quirks; wl->if_ops = pdev_data->if_ops; @@ -142,7 +142,7 @@ thread in process context as well. if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_nvs; -@@ -6076,7 +6087,11 @@ out_unreg: +@@ -6077,7 +6088,11 @@ out_unreg: wl1271_unregister_hw(wl); out_irq: @@ -154,7 +154,7 @@ thread in process context as well. out_free_nvs: kfree(wl->nvs); -@@ -6122,7 +6137,12 @@ int wlcore_remove(struct platform_device +@@ -6123,7 +6138,12 @@ int wlcore_remove(struct platform_device disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch index 109711755b01..84ef8784f9f8 100644 --- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch +++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch @@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-drivers. device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -879,6 +875,15 @@ static int cfg80211_netdev_notifier_call +@@ -919,6 +915,15 @@ static int cfg80211_netdev_notifier_call wdev->sme_state = CFG80211_SME_IDLE; mutex_unlock(&rdev->devlist_mtx); #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch index 9cdc24841071..5071d241dda9 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch @@ -149,7 +149,7 @@ calls on compat code with only slight modifications. static int __init --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -6802,7 +6802,12 @@ static struct pci_driver il4965_driver = +@@ -6803,7 +6803,12 @@ static struct pci_driver il4965_driver = .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, .remove = il4965_pci_remove, @@ -184,7 +184,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1837,7 +1837,14 @@ __le32 il_add_beacon_time(struct il_priv +@@ -1833,7 +1833,14 @@ __le32 il_add_beacon_time(struct il_priv u32 beacon_interval); #ifdef CONFIG_PM @@ -201,7 +201,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -349,6 +349,9 @@ static int iwl_pci_resume(struct device +@@ -347,6 +347,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -211,7 +211,7 @@ calls on compat code with only slight modifications. static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -364,7 +367,12 @@ static struct pci_driver iwl_pci_driver +@@ -362,7 +365,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch index 67a111f68527..7c96bb781844 100644 --- a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch +++ b/patches/collateral-evolutions/network/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 -@@ -3314,7 +3314,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3305,7 +3305,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch index d85e7e4e5209..e1e2e50e2312 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2650,15 +2650,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2656,15 +2656,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2679,13 +2685,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2685,13 +2691,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -5018,7 +5038,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -5024,7 +5044,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -5029,7 +5053,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -5035,7 +5059,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -5151,7 +5179,11 @@ static void mwl8k_configure_filter(struc +@@ -5157,7 +5185,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2587,7 +2587,11 @@ struct ieee80211_ops { +@@ -2601,7 +2601,11 @@ struct ieee80211_ops { void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); 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 -@@ -915,7 +915,12 @@ struct ieee80211_local { +@@ -912,7 +912,12 @@ struct ieee80211_local { struct work_struct reconfig_filter; /* aggregated multicast list */ @@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -744,8 +744,13 @@ static void ieee80211_do_stop(struct iee +@@ -742,8 +742,13 @@ static void ieee80211_do_stop(struct iee if (sdata->dev) { netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); @@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -922,7 +927,12 @@ static void ieee80211_set_multicast_list +@@ -920,7 +925,12 @@ static void ieee80211_set_multicast_list sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); @@ -768,8 +768,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -611,9 +615,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( - wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask; +@@ -610,9 +614,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( + wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask; INIT_LIST_HEAD(&local->interfaces); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) diff --git a/patches/collateral-evolutions/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch index b42d81e8718e..f7b4ea75029e 100644 --- a/patches/collateral-evolutions/network/30-bridge-port.patch +++ b/patches/collateral-evolutions/network/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-drivers. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -2013,7 +2013,7 @@ static int nl80211_valid_4addr(struct cf +@@ -2298,7 +2298,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/collateral-evolutions/network/32-remove-ns-type.patch b/patches/collateral-evolutions/network/32-remove-ns-type.patch index ade35c86eaa8..9f25775b49e6 100644 --- a/patches/collateral-evolutions/network/32-remove-ns-type.patch +++ b/patches/collateral-evolutions/network/32-remove-ns-type.patch @@ -1,6 +1,6 @@ --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c -@@ -118,12 +118,14 @@ static int wiphy_resume(struct device *d +@@ -133,12 +133,14 @@ static int wiphy_resume(struct device *d return ret; } @@ -15,7 +15,7 @@ struct class ieee80211_class = { .name = "ieee80211", -@@ -133,8 +135,10 @@ struct class ieee80211_class = { +@@ -148,8 +150,10 @@ struct class ieee80211_class = { .dev_uevent = wiphy_uevent, .suspend = wiphy_suspend, .resume = wiphy_resume, diff --git a/patches/collateral-evolutions/network/36-workqueue.patch b/patches/collateral-evolutions/network/36-workqueue.patch index bffb6b1e2bf4..2e55c0e3f174 100644 --- a/patches/collateral-evolutions/network/36-workqueue.patch +++ b/patches/collateral-evolutions/network/36-workqueue.patch @@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1177,6 +1177,10 @@ static void __exit ieee80211_exit(void) +@@ -1170,6 +1170,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features.patch b/patches/collateral-evolutions/network/40-netdev-hw-features.patch index d3a2047e232d..db4127486398 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features.patch @@ -150,7 +150,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /** * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1927,7 +1929,11 @@ void atl1e_down(struct atl1e_adapter *ad +@@ -1925,7 +1927,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags); @@ -162,7 +162,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2197,8 +2203,10 @@ static const struct net_device_ops atl1e +@@ -2195,8 +2201,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr, @@ -173,7 +173,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2218,10 +2226,15 @@ static int atl1e_init_netdev(struct net_ +@@ -2216,10 +2224,15 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev); @@ -260,7 +260,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 static void atl2_intr_rx(struct atl2_adapter *adapter) { -@@ -1322,8 +1324,10 @@ static const struct net_device_ops atl2_ +@@ -1319,8 +1321,10 @@ static const struct net_device_ops atl2_ .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl2_set_mac, .ndo_change_mtu = atl2_change_mtu, @@ -271,7 +271,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 .ndo_do_ioctl = atl2_ioctl, .ndo_tx_timeout = atl2_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER -@@ -1420,8 +1424,12 @@ static int atl2_probe(struct pci_dev *pd +@@ -1417,8 +1421,12 @@ static int atl2_probe(struct pci_dev *pd err = -EIO; @@ -284,7 +284,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* Init PHY as early as possible due to power saving issue */ atl2_phy_init(&adapter->hw); -@@ -1841,6 +1849,13 @@ static int atl2_set_settings(struct net_ +@@ -1838,6 +1846,13 @@ static int atl2_set_settings(struct net_ return 0; } @@ -298,7 +298,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 static u32 atl2_get_msglevel(struct net_device *netdev) { return 0; -@@ -2110,6 +2125,14 @@ static const struct ethtool_ops atl2_eth +@@ -2107,6 +2122,14 @@ static const struct ethtool_ops atl2_eth .get_eeprom_len = atl2_get_eeprom_len, .get_eeprom = atl2_get_eeprom, .set_eeprom = atl2_set_eeprom, diff --git a/patches/collateral-evolutions/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch index efb44f9033b2..f36e7773055e 100644 --- a/patches/collateral-evolutions/network/42-netlink_seq.patch +++ b/patches/collateral-evolutions/network/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5308,7 +5308,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -5656,7 +5656,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/collateral-evolutions/network/46-use_other_workqueue.patch b/patches/collateral-evolutions/network/46-use_other_workqueue.patch index 4f5ba875875e..7766f84b2dbe 100644 --- a/patches/collateral-evolutions/network/46-use_other_workqueue.patch +++ b/patches/collateral-evolutions/network/46-use_other_workqueue.patch @@ -4,7 +4,7 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -2066,16 +2066,24 @@ int hci_register_dev(struct hci_dev *hde +@@ -2068,16 +2068,24 @@ int hci_register_dev(struct hci_dev *hde list_add(&hdev->list, &hci_dev_list); write_unlock(&hci_dev_list_lock); diff --git a/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch index 6ccb5d19a2fb..72f248029190 100644 --- a/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch +++ b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch @@ -5,7 +5,7 @@ the message is printed and traced. --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -75,13 +75,16 @@ void __iwl_ ##fn(struct device *dev, con +@@ -76,13 +76,16 @@ void __iwl_ ##fn(struct device *dev, con struct va_format vaf = { \ .fmt = fmt, \ }; \ @@ -26,7 +26,7 @@ the message is printed and traced. } __iwl_fn(warn) -@@ -100,13 +103,18 @@ void __iwl_err(struct device *dev, bool +@@ -101,13 +104,18 @@ void __iwl_err(struct device *dev, bool va_list args; va_start(args, fmt); @@ -46,7 +46,7 @@ the message is printed and traced. trace_iwlwifi_err(&vaf); va_end(args); } -@@ -123,13 +131,19 @@ void __iwl_dbg(struct device *dev, +@@ -124,13 +132,19 @@ void __iwl_dbg(struct device *dev, va_list args; va_start(args, fmt); diff --git a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch index 4b2dfa9d26f6..db7cc80320d9 100644 --- a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch +++ b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch @@ -5,7 +5,7 @@ dev_printk to make them show up again. --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -138,8 +138,9 @@ void __iwl_dbg(struct device *dev, +@@ -139,8 +139,9 @@ void __iwl_dbg(struct device *dev, va_copy(args2, args); vaf.va = &args2; diff --git a/patches/collateral-evolutions/network/67-ipv6-dev-list.patch b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch index 96f45a9aa69a..6c816271c422 100644 --- a/patches/collateral-evolutions/network/67-ipv6-dev-list.patch +++ b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch @@ -8,7 +8,7 @@ Date: Wed Mar 17 20:31:13 2010 +0000 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c -@@ -99,7 +99,11 @@ void iwl_mvm_ipv6_addr_change(struct iee +@@ -101,7 +101,11 @@ void iwl_mvm_ipv6_addr_change(struct iee int idx = 0; read_lock_bh(&idev->lock); diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch index 868dff2ba7b3..e8d691ad13e5 100644 --- a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch +++ b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch @@ -2,7 +2,7 @@ __sock_create() is not available on kernel version < 2.6.37. --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -7332,7 +7332,7 @@ static int nl80211_parse_wowlan_tcp(stru +@@ -7715,7 +7715,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0; -- 2.30.2