From: Johannes Berg Date: Fri, 5 Apr 2013 23:06:03 +0000 (+0200) Subject: backports: rename all patches to *.patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3ee5050684013c5f8dab210cc89227db369f46dc;p=openwrt%2Fstaging%2Fblogic.git backports: rename all patches to *.patch Also combine some that would otherwise have the same names (where .c and .h files with the same name exist) Signed-off-by: Johannes Berg --- diff --git a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.h b/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.h deleted file mode 100644 index 5039684e2ba4..000000000000 --- a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.h +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/net/wireless/libertas/defs.h -+++ b/drivers/net/wireless/libertas/defs.h -@@ -16,6 +16,14 @@ - #define DRV_NAME "libertas" - #endif - -+/* -+ * Really nasty hack to avoid stuffing compat.diff with tons of ifdefs, -+ * we could add this to a compat header file but too lazy to check ml_priv -+ * is not used anywhere else -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) -+#define ml_priv priv -+#endif - - #define LBS_DEB_ENTER 0x00000001 - #define LBS_DEB_LEAVE 0x00000002 diff --git a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch b/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch new file mode 100644 index 000000000000..5039684e2ba4 --- /dev/null +++ b/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch @@ -0,0 +1,17 @@ +--- a/drivers/net/wireless/libertas/defs.h ++++ b/drivers/net/wireless/libertas/defs.h +@@ -16,6 +16,14 @@ + #define DRV_NAME "libertas" + #endif + ++/* ++ * Really nasty hack to avoid stuffing compat.diff with tons of ifdefs, ++ * we could add this to a compat header file but too lazy to check ml_priv ++ * is not used anywhere else ++ */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) ++#define ml_priv priv ++#endif + + #define LBS_DEB_ENTER 0x00000001 + #define LBS_DEB_LEAVE 0x00000002 diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.h b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.h deleted file mode 100644 index 1b8189acbe5a..000000000000 --- a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/b43/phy_common.h -+++ b/drivers/net/wireless/b43/phy_common.h -@@ -3,6 +3,9 @@ - - #include - #include -+#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) -+#include -+#endif - - struct b43_wldev; - diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.patch new file mode 100644 index 000000000000..1b8189acbe5a --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/b43/phy_common.h ++++ b/drivers/net/wireless/b43/phy_common.h +@@ -3,6 +3,9 @@ + + #include + #include ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include ++#endif + + struct b43_wldev; + diff --git a/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.h b/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.h deleted file mode 100644 index 2ba84707ecfd..000000000000 --- a/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.h +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /** - * DOC: Introduction diff --git a/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch b/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch new file mode 100644 index 000000000000..2ba84707ecfd --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch @@ -0,0 +1,10 @@ +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + /** + * DOC: Introduction diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h deleted file mode 100644 index fa828678c9da..000000000000 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/include/net/cfg80211.h -+++ b/include/net/cfg80211.h -@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { - struct wiphy { - /* assign these fields before you register the wiphy */ - -+#define WIPHY_COMPAT_PAD_SIZE 2048 -+ u8 padding[WIPHY_COMPAT_PAD_SIZE]; -+ - /* permanent MAC address(es) */ - u8 perm_addr[ETH_ALEN]; - u8 addr_mask[ETH_ALEN]; diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch new file mode 100644 index 000000000000..fa828678c9da --- /dev/null +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch @@ -0,0 +1,12 @@ +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { + struct wiphy { + /* assign these fields before you register the wiphy */ + ++#define WIPHY_COMPAT_PAD_SIZE 2048 ++ u8 padding[WIPHY_COMPAT_PAD_SIZE]; ++ + /* permanent MAC address(es) */ + u8 perm_addr[ETH_ALEN]; + u8 addr_mask[ETH_ALEN]; diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h deleted file mode 100644 index 8889d233b0a9..000000000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/b43/b43.h -+++ b/drivers/net/wireless/b43/b43.h -@@ -872,6 +872,9 @@ struct b43_wldev { - unsigned int tx_count; - unsigned int rx_count; - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - }; - - /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch new file mode 100644 index 000000000000..8889d233b0a9 --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/b43/b43.h ++++ b/drivers/net/wireless/b43/b43.h +@@ -872,6 +872,9 @@ struct b43_wldev { + unsigned int tx_count; + unsigned int rx_count; + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h deleted file mode 100644 index 3666d99519c1..000000000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/pcie/internal.h -+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -311,6 +311,9 @@ struct iwl_trans_pcie { - - /*protect hw register */ - spinlock_t reg_lock; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - }; - - /** diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch new file mode 100644 index 000000000000..3666d99519c1 --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/iwlwifi/pcie/internal.h ++++ b/drivers/net/wireless/iwlwifi/pcie/internal.h +@@ -311,6 +311,9 @@ struct iwl_trans_pcie { + + /*protect hw register */ + spinlock_t reg_lock; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /** diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h deleted file mode 100644 index 67e0bc1a0ee6..000000000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ti/wlcore/wlcore.h -+++ b/drivers/net/wireless/ti/wlcore/wlcore.h -@@ -175,7 +175,9 @@ struct wl1271 { - bool initialized; - struct ieee80211_hw *hw; - bool mac80211_registered; -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - struct device *dev; - struct platform_device *pdev; - diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch new file mode 100644 index 000000000000..67e0bc1a0ee6 --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/ti/wlcore/wlcore.h ++++ b/drivers/net/wireless/ti/wlcore/wlcore.h +@@ -175,7 +175,9 @@ struct wl1271 { + bool initialized; + struct ieee80211_hw *hw; + bool mac80211_registered; +- ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + struct device *dev; + struct platform_device *pdev; + diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h deleted file mode 100644 index c9a27033cc90..000000000000 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/net/wireless/iwlegacy/common.h -+++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1833,7 +1833,14 @@ __le32 il_add_beacon_time(struct il_priv - u32 beacon_interval); - - #ifdef CONFIG_PM -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) -+int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state); -+int il_pci_resume_compat(struct pci_dev *pdev); -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) -+extern struct dev_pm_ops il_pm_ops; -+#else - extern const struct dev_pm_ops il_pm_ops; -+#endif - - #define IL_LEGACY_PM_OPS (&il_pm_ops) - diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch index d59c31b2925b..c46544d6e690 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch @@ -18,3 +18,20 @@ #endif /* CONFIG_PM_SLEEP */ +--- a/drivers/net/wireless/iwlegacy/common.h ++++ b/drivers/net/wireless/iwlegacy/common.h +@@ -1833,7 +1833,14 @@ __le32 il_add_beacon_time(struct il_priv + u32 beacon_interval); + + #ifdef CONFIG_PM ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state); ++int il_pci_resume_compat(struct pci_dev *pdev); ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) ++extern struct dev_pm_ops il_pm_ops; ++#else + extern const struct dev_pm_ops il_pm_ops; ++#endif + + #define IL_LEGACY_PM_OPS (&il_pm_ops) + diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.h b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.h deleted file mode 100644 index e01119bea192..000000000000 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/orinoco/hw.h -+++ b/drivers/net/wireless/orinoco/hw.h -@@ -22,6 +22,9 @@ - - /* Forward declarations */ - struct orinoco_private; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) -+struct dev_addr_list; -+#endif - - int determine_fw_capabilities(struct orinoco_private *priv, char *fw_name, - size_t fw_name_len, u32 *hw_ver); diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch index 92d2e4c211c7..9ad33bc9709a 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch @@ -12,3 +12,15 @@ } err = hw->ops->write_ltv(hw, USER_BAP, +--- a/drivers/net/wireless/orinoco/hw.h ++++ b/drivers/net/wireless/orinoco/hw.h +@@ -22,6 +22,9 @@ + + /* Forward declarations */ + struct orinoco_private; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++struct dev_addr_list; ++#endif + + int determine_fw_capabilities(struct orinoco_private *priv, char *fw_name, + size_t fw_name_len, u32 *hw_ver); diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h deleted file mode 100644 index e1a1597acdba..000000000000 --- a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h +++ /dev/null @@ -1,27 +0,0 @@ ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -2604,14 +2604,24 @@ struct ieee80211_ops { - void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); - - u64 (*prepare_multicast)(struct ieee80211_hw *hw, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - struct netdev_hw_addr_list *mc_list); -+#else -+ int mc_count, struct dev_addr_list *mc_list); -+#endif - void (*configure_filter)(struct ieee80211_hw *hw, - unsigned int changed_flags, - unsigned int *total_flags, - u64 multicast); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - void (*set_multicast_list)(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, bool allmulti, - struct netdev_hw_addr_list *mc_list); -+#else -+ void (*set_multicast_list)(struct ieee80211_hw *hw, -+ struct ieee80211_vif *vif, bool allmulti, -+ int mc_count, struct dev_addr_list *ha); -+#endif - - int (*set_tim)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, - bool set); diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch new file mode 100644 index 000000000000..e1a1597acdba --- /dev/null +++ b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch @@ -0,0 +1,27 @@ +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -2604,14 +2604,24 @@ struct ieee80211_ops { + void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); + + u64 (*prepare_multicast)(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list); ++#else ++ int mc_count, struct dev_addr_list *mc_list); ++#endif + void (*configure_filter)(struct ieee80211_hw *hw, + unsigned int changed_flags, + unsigned int *total_flags, + u64 multicast); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + void (*set_multicast_list)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, bool allmulti, + struct netdev_hw_addr_list *mc_list); ++#else ++ void (*set_multicast_list)(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, bool allmulti, ++ int mc_count, struct dev_addr_list *ha); ++#endif + + int (*set_tim)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, + bool set); diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h deleted file mode 100644 index 97dff3f74377..000000000000 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h +++ /dev/null @@ -1,62 +0,0 @@ ---- a/net/mac80211/driver-ops.h -+++ b/net/mac80211/driver-ops.h -@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( - } - - static inline u64 drv_prepare_multicast(struct ieee80211_local *local, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - struct netdev_hw_addr_list *mc_list) -+#else -+ int mc_count, -+ struct dev_addr_list *mc_list) -+#endif - { - u64 ret = 0; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - trace_drv_prepare_multicast(local, mc_list->count); -+#else -+ trace_drv_prepare_multicast(local, mc_count); -+#endif - - if (local->ops->prepare_multicast) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - ret = local->ops->prepare_multicast(&local->hw, mc_list); -+#else -+ ret = local->ops->prepare_multicast(&local->hw, mc_count, -+ mc_list); -+#endif - - trace_drv_return_u64(local, ret); - - return ret; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - static inline void drv_set_multicast_list(struct ieee80211_local *local, - struct ieee80211_sub_if_data *sdata, - struct netdev_hw_addr_list *mc_list) -@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis - allmulti, mc_list); - trace_drv_return_void(local); - } -+#else -+static inline void drv_set_multicast_list(struct ieee80211_local *local, -+ struct ieee80211_sub_if_data *sdata, -+ int mc_count, struct dev_addr_list *ha) -+{ -+ bool allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI; -+ -+ trace_drv_set_multicast_list(local, sdata, mc_count); -+ -+ check_sdata_in_driver(sdata); -+ -+ if (local->ops->set_multicast_list) -+ local->ops->set_multicast_list(&local->hw, &sdata->vif, -+ allmulti, mc_count, ha); -+ trace_drv_return_void(local); -+} -+#endif - - static inline void drv_configure_filter(struct ieee80211_local *local, - unsigned int changed_flags, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch new file mode 100644 index 000000000000..97dff3f74377 --- /dev/null +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch @@ -0,0 +1,62 @@ +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( + } + + static inline u64 drv_prepare_multicast(struct ieee80211_local *local, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, ++ struct dev_addr_list *mc_list) ++#endif + { + u64 ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + trace_drv_prepare_multicast(local, mc_list->count); ++#else ++ trace_drv_prepare_multicast(local, mc_count); ++#endif + + if (local->ops->prepare_multicast) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = local->ops->prepare_multicast(&local->hw, mc_list); ++#else ++ ret = local->ops->prepare_multicast(&local->hw, mc_count, ++ mc_list); ++#endif + + trace_drv_return_u64(local, ret); + + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static inline void drv_set_multicast_list(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct netdev_hw_addr_list *mc_list) +@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis + allmulti, mc_list); + trace_drv_return_void(local); + } ++#else ++static inline void drv_set_multicast_list(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ int mc_count, struct dev_addr_list *ha) ++{ ++ bool allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI; ++ ++ trace_drv_set_multicast_list(local, sdata, mc_count); ++ ++ check_sdata_in_driver(sdata); ++ ++ if (local->ops->set_multicast_list) ++ local->ops->set_multicast_list(&local->hw, &sdata->vif, ++ allmulti, mc_count, ha); ++ trace_drv_return_void(local); ++} ++#endif + + static inline void drv_configure_filter(struct ieee80211_local *local, + unsigned int changed_flags, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h deleted file mode 100644 index 5936ffbeb7a2..000000000000 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/mac80211/ieee80211_i.h -+++ b/net/mac80211/ieee80211_i.h -@@ -908,7 +908,12 @@ struct ieee80211_local { - struct work_struct reconfig_filter; - - /* aggregated multicast list */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - struct netdev_hw_addr_list mc_list; -+#else -+ struct dev_addr_list *mc_list; -+ int mc_count; -+#endif - - bool tim_in_locked_section; /* see ieee80211_beacon_get() */ - diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch new file mode 100644 index 000000000000..5936ffbeb7a2 --- /dev/null +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch @@ -0,0 +1,15 @@ +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -908,7 +908,12 @@ struct ieee80211_local { + struct work_struct reconfig_filter; + + /* aggregated multicast list */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list mc_list; ++#else ++ struct dev_addr_list *mc_list; ++ int mc_count; ++#endif + + bool tim_in_locked_section; /* see ieee80211_beacon_get() */ + diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h deleted file mode 100644 index f4dc9464a6e5..000000000000 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/net/wireless/orinoco/hermes.h -+++ b/drivers/net/wireless/orinoco/hermes.h -@@ -393,7 +393,7 @@ struct hermes_ops { - u16 id, u16 offset); - int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf, - int len, u16 id, u16 offset); -- int (*read_pda)(struct hermes *hw, __le16 *pda, -+ int (*read_pda_h)(struct hermes *hw, __le16 *pda, - u32 pda_addr, u16 pda_len); - int (*program_init)(struct hermes *hw, u32 entry_point); - int (*program_end)(struct hermes *hw); diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch index eb293fec7a2d..70e108a637cb 100644 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch @@ -9,3 +9,14 @@ .program_init = hermesi_program_init, .program_end = hermesi_program_end, .program = hermes_program_bytes, +--- a/drivers/net/wireless/orinoco/hermes.h ++++ b/drivers/net/wireless/orinoco/hermes.h +@@ -393,7 +393,7 @@ struct hermes_ops { + u16 id, u16 offset); + int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf, + int len, u16 id, u16 offset); +- int (*read_pda)(struct hermes *hw, __le16 *pda, ++ int (*read_pda_h)(struct hermes *hw, __le16 *pda, + u32 pda_addr, u16 pda_len); + int (*program_init)(struct hermes *hw, u32 entry_point); + int (*program_end)(struct hermes *hw); diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile deleted file mode 100644 index aa914462c273..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile -+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile -@@ -16,8 +16,8 @@ - # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ccflags-y += \ -- -Idrivers/net/wireless/brcm80211/brcmfmac \ -- -Idrivers/net/wireless/brcm80211/include -+ -I$(obj) \ -+ -I$(obj)/../include - - ccflags-y += -D__CHECK_ENDIAN__ - diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile.patch new file mode 100644 index 000000000000..aa914462c273 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile +@@ -16,8 +16,8 @@ + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ccflags-y += \ +- -Idrivers/net/wireless/brcm80211/brcmfmac \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/../include + + ccflags-y += -D__CHECK_ENDIAN__ + diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile deleted file mode 100644 index 973adaf62275..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile -+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile -@@ -17,9 +17,9 @@ - - ccflags-y := \ - -D__CHECK_ENDIAN__ \ -- -Idrivers/net/wireless/brcm80211/brcmsmac \ -- -Idrivers/net/wireless/brcm80211/brcmsmac/phy \ -- -Idrivers/net/wireless/brcm80211/include -+ -I$(obj) \ -+ -I$(obj)/phy \ -+ -I$(obj)/../include - - BRCMSMAC_OFILES := \ - mac80211_if.o \ diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile.patch new file mode 100644 index 000000000000..973adaf62275 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile.patch @@ -0,0 +1,15 @@ +--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile +@@ -17,9 +17,9 @@ + + ccflags-y := \ + -D__CHECK_ENDIAN__ \ +- -Idrivers/net/wireless/brcm80211/brcmsmac \ +- -Idrivers/net/wireless/brcm80211/brcmsmac/phy \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/phy \ ++ -I$(obj)/../include + + BRCMSMAC_OFILES := \ + mac80211_if.o \ diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile deleted file mode 100644 index 13545013ecb7..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmutil/Makefile -+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile -@@ -16,8 +16,8 @@ - # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ccflags-y := \ -- -Idrivers/net/wireless/brcm80211/brcmutil \ -- -Idrivers/net/wireless/brcm80211/include -+ -I$(obj) \ -+ -I$(obj)/../include - - BRCMUTIL_OFILES := \ - utils.o diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile.patch new file mode 100644 index 000000000000..13545013ecb7 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile +@@ -16,8 +16,8 @@ + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ccflags-y := \ +- -Idrivers/net/wireless/brcm80211/brcmutil \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/../include + + BRCMUTIL_OFILES := \ + utils.o diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile deleted file mode 100644 index e42e0b5817f1..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- a/drivers/net/wireless/rtl818x/rtl8180/Makefile -+++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile -@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400. - - obj-$(CONFIG_RTL8180) += rtl8180.o - --ccflags-y += -Idrivers/net/wireless/rtl818x -+ccflags-y += -I$(obj)/.. diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile.patch new file mode 100644 index 000000000000..e42e0b5817f1 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile.patch @@ -0,0 +1,8 @@ +--- a/drivers/net/wireless/rtl818x/rtl8180/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile +@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400. + + obj-$(CONFIG_RTL8180) += rtl8180.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile deleted file mode 100644 index 91bbf32733b8..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- a/drivers/net/wireless/rtl818x/rtl8187/Makefile -+++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile -@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o - - obj-$(CONFIG_RTL8187) += rtl8187.o - --ccflags-y += -Idrivers/net/wireless/rtl818x -+ccflags-y += -I$(obj)/.. diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile.patch new file mode 100644 index 000000000000..91bbf32733b8 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile.patch @@ -0,0 +1,8 @@ +--- a/drivers/net/wireless/rtl818x/rtl8187/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile +@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o + + obj-$(CONFIG_RTL8187) += rtl8187.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile deleted file mode 100644 index 43c1dfb90db6..000000000000 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/wireless/Makefile -+++ b/net/wireless/Makefile -@@ -20,6 +20,6 @@ CFLAGS_trace.o := -I$(src) - ccflags-y += -D__CHECK_ENDIAN__ - - $(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk -- @$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@ -+ @$(AWK) -f $(src)/genregdb.awk < $< > $@ - - clean-files := regdb.c diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile.patch new file mode 100644 index 000000000000..43c1dfb90db6 --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile.patch @@ -0,0 +1,10 @@ +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -20,6 +20,6 @@ CFLAGS_trace.o := -I$(src) + ccflags-y += -D__CHECK_ENDIAN__ + + $(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk +- @$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@ ++ @$(AWK) -f $(src)/genregdb.awk < $< > $@ + + clean-files := regdb.c diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.h b/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.h deleted file mode 100644 index 913deecf1586..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.h +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/bcma/bcma_private.h -+++ b/drivers/bcma/bcma_private.h -@@ -1,10 +1,10 @@ - #ifndef LINUX_BCMA_PRIVATE_H_ - #define LINUX_BCMA_PRIVATE_H_ - --#ifndef pr_fmt -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --#endif - -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch new file mode 100644 index 000000000000..913deecf1586 --- /dev/null +++ b/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch @@ -0,0 +1,15 @@ +--- a/drivers/bcma/bcma_private.h ++++ b/drivers/bcma/bcma_private.h +@@ -1,10 +1,10 @@ + #ifndef LINUX_BCMA_PRIVATE_H_ + #define LINUX_BCMA_PRIVATE_H_ + +-#ifndef pr_fmt ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +-#endif + ++#include + #include + #include + diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.h b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.h deleted file mode 100644 index bed0b2941c1e..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.h +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/wifi.h -+++ b/drivers/net/wireless/rtlwifi/wifi.h -@@ -30,8 +30,10 @@ - #ifndef __RTL_WIFI_H__ - #define __RTL_WIFI_H__ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch new file mode 100644 index 000000000000..bed0b2941c1e --- /dev/null +++ b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/rtlwifi/wifi.h ++++ b/drivers/net/wireless/rtlwifi/wifi.h +@@ -30,8 +30,10 @@ + #ifndef __RTL_WIFI_H__ + #define __RTL_WIFI_H__ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include + #include + #include + #include diff --git a/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h b/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h deleted file mode 100644 index f5d69d4f1dce..000000000000 --- a/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/linux/rfkill_backport.h -+++ b/include/linux/rfkill_backport.h -@@ -18,7 +18,7 @@ - #ifndef __RFKILL_H - #define __RFKILL_H - --#include -+#include - - /* don't allow anyone to use these in the kernel */ - enum rfkill_user_states { diff --git a/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch b/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch new file mode 100644 index 000000000000..f5d69d4f1dce --- /dev/null +++ b/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch @@ -0,0 +1,11 @@ +--- a/include/linux/rfkill_backport.h ++++ b/include/linux/rfkill_backport.h +@@ -18,7 +18,7 @@ + #ifndef __RFKILL_H + #define __RFKILL_H + +-#include ++#include + + /* don't allow anyone to use these in the kernel */ + enum rfkill_user_states {