From 3ee5050684013c5f8dab210cc89227db369f46dc Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 6 Apr 2013 01:06:03 +0200 Subject: [PATCH] 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 --- ...=> drivers_net_wireless_libertas_defs.patch} | 0 ...> drivers_net_wireless_b43_phy_common.patch} | 0 ...et_mac80211.h => include_net_mac80211.patch} | 0 ...et_cfg80211.h => include_net_cfg80211.patch} | 0 ...b43.h => drivers_net_wireless_b43_b43.patch} | 0 ...rs_net_wireless_iwlwifi_pcie_internal.patch} | 0 ...drivers_net_wireless_ti_wlcore_wlcore.patch} | 0 .../drivers_net_wireless_iwlegacy_common.h | 17 ----------------- .../drivers_net_wireless_iwlegacy_common.patch | 17 +++++++++++++++++ .../drivers_net_wireless_orinoco_hw.h | 12 ------------ .../drivers_net_wireless_orinoco_hw.patch | 12 ++++++++++++ ...et_mac80211.h => include_net_mac80211.patch} | 0 ...iver-ops.h => net_mac80211_driver-ops.patch} | 0 ...80211_i.h => net_mac80211_ieee80211_i.patch} | 0 .../drivers_net_wireless_orinoco_hermes.h | 11 ----------- .../drivers_net_wireless_orinoco_hermes.patch | 11 +++++++++++ ..._wireless_brcm80211_brcmfmac_Makefile.patch} | 0 ..._wireless_brcm80211_brcmsmac_Makefile.patch} | 0 ..._wireless_brcm80211_brcmutil_Makefile.patch} | 0 ...net_wireless_rtl818x_rtl8180_Makefile.patch} | 0 ...net_wireless_rtl818x_rtl8187_Makefile.patch} | 0 ...ess_Makefile => net_wireless_Makefile.patch} | 0 ...rivate.h => drivers_bcma_bcma_private.patch} | 0 ... => drivers_net_wireless_rtlwifi_wifi.patch} | 0 ...rt.h => include_linux_rfkill_backport.patch} | 0 25 files changed, 40 insertions(+), 40 deletions(-) rename patches/collateral-evolutions/network/0002-net-misc/{drivers_net_wireless_libertas_defs.h => drivers_net_wireless_libertas_defs.patch} (100%) rename patches/collateral-evolutions/network/06-header-changes/{drivers_net_wireless_b43_phy_common.h => drivers_net_wireless_b43_phy_common.patch} (100%) rename patches/collateral-evolutions/network/06-header-changes/{include_net_mac80211.h => include_net_mac80211.patch} (100%) rename patches/collateral-evolutions/network/09-cfg80211-wext-padding/{include_net_cfg80211.h => include_net_cfg80211.patch} (100%) rename patches/collateral-evolutions/network/09-threaded-irq/{drivers_net_wireless_b43_b43.h => drivers_net_wireless_b43_b43.patch} (100%) rename patches/collateral-evolutions/network/09-threaded-irq/{drivers_net_wireless_iwlwifi_pcie_internal.h => drivers_net_wireless_iwlwifi_pcie_internal.patch} (100%) rename patches/collateral-evolutions/network/09-threaded-irq/{drivers_net_wireless_ti_wlcore_wlcore.h => drivers_net_wireless_ti_wlcore_wlcore.patch} (100%) delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h delete mode 100644 patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.h rename patches/collateral-evolutions/network/25-multicast-list_head/{include_net_mac80211.h => include_net_mac80211.patch} (100%) rename patches/collateral-evolutions/network/25-multicast-list_head/{net_mac80211_driver-ops.h => net_mac80211_driver-ops.patch} (100%) rename patches/collateral-evolutions/network/25-multicast-list_head/{net_mac80211_ieee80211_i.h => net_mac80211_ieee80211_i.patch} (100%) delete mode 100644 patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h rename patches/collateral-evolutions/network/35-fix-makefile-includes/{drivers_net_wireless_brcm80211_brcmfmac_Makefile => drivers_net_wireless_brcm80211_brcmfmac_Makefile.patch} (100%) rename patches/collateral-evolutions/network/35-fix-makefile-includes/{drivers_net_wireless_brcm80211_brcmsmac_Makefile => drivers_net_wireless_brcm80211_brcmsmac_Makefile.patch} (100%) rename patches/collateral-evolutions/network/35-fix-makefile-includes/{drivers_net_wireless_brcm80211_brcmutil_Makefile => drivers_net_wireless_brcm80211_brcmutil_Makefile.patch} (100%) rename patches/collateral-evolutions/network/35-fix-makefile-includes/{drivers_net_wireless_rtl818x_rtl8180_Makefile => drivers_net_wireless_rtl818x_rtl8180_Makefile.patch} (100%) rename patches/collateral-evolutions/network/35-fix-makefile-includes/{drivers_net_wireless_rtl818x_rtl8187_Makefile => drivers_net_wireless_rtl818x_rtl8187_Makefile.patch} (100%) rename patches/collateral-evolutions/network/35-fix-makefile-includes/{net_wireless_Makefile => net_wireless_Makefile.patch} (100%) rename patches/collateral-evolutions/network/53-pr_fmt/{drivers_bcma_bcma_private.h => drivers_bcma_bcma_private.patch} (100%) rename patches/collateral-evolutions/network/53-pr_fmt/{drivers_net_wireless_rtlwifi_wifi.h => drivers_net_wireless_rtlwifi_wifi.patch} (100%) rename patches/collateral-evolutions/network/66-uapi-changes/{include_linux_rfkill_backport.h => include_linux_rfkill_backport.patch} (100%) 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.patch similarity index 100% rename from patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.h rename to patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.h rename to patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_b43_phy_common.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.h rename to patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h rename to patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h rename to patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h rename to patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h rename to patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h rename to patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h rename to patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h rename to patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmfmac_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmsmac_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_brcm80211_brcmutil_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile rename to patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.h rename to patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.h rename to patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch 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.patch similarity index 100% rename from patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h rename to patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch -- 2.30.2