diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 22:42:11 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 22:42:15 +0200 |
commit | 62778e880b8d40f972619e458be48dc1c403bc09 (patch) | |
tree | 2c42cd8cbfcb2eb9128cf78b581d99515139a55c /patches | |
parent | 5fa07c9c206d1b10964303c2556a902b4863f8fa (diff) |
Revert "backports: remove header file patches"
This reverts commit 41a5d256482183aed7b863bc0bdbf95955cdf23b.
These still seem to be needed ... need to fix first.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
17 files changed, 176 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/06-header-changes/INFO b/patches/collateral-evolutions/network/06-header-changes/INFO new file mode 100644 index 00000000..eccf5d6d --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/INFO @@ -0,0 +1,6 @@ + +Every kernel release there are a few changes to headers +made. Some code gets shifted around between headers or +new headers are defined. This patch deals with such +cases. + diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch new file mode 100644 index 00000000..193faac3 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c ++++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c +@@ -20,6 +20,7 @@ + #include <linux/moduleparam.h> + #include <linux/inetdevice.h> + #include <linux/export.h> ++#include <asm/unaligned.h> + + #include "core.h" + #include "cfg80211.h" diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch new file mode 100644 index 00000000..ef776914 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c ++++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c +@@ -18,6 +18,10 @@ + #include "debug.h" + #include "hif-ops.h" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++#include <asm/unaligned.h> ++#endif ++ + #define HTC_PACKET_CONTAINER_ALLOCATION 32 + #define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH) + 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 00000000..1b8189ac --- /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 <linux/types.h> + #include <linux/nl80211.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <asm/atomic.h> ++#endif + + struct b43_wldev; + diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_mwifiex_usb.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_mwifiex_usb.patch new file mode 100644 index 00000000..75a3db99 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_mwifiex_usb.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/mwifiex/usb.c ++++ b/drivers/net/wireless/mwifiex/usb.c +@@ -19,6 +19,7 @@ + + #include "main.h" + #include "usb.h" ++#include <linux/usb/audio.h> + + #define USB_VERSION "1.0" + diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch new file mode 100644 index 00000000..ea33c7d8 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/rtlwifi/base.c ++++ b/drivers/net/wireless/rtlwifi/base.c +@@ -36,6 +36,7 @@ + #include "regd.h" + + #include <linux/ip.h> ++#include <linux/in.h> + #include <linux/module.h> + + /* diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_main.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_main.patch new file mode 100644 index 00000000..4701f488 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_main.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/ti/wl1251/main.c ++++ b/drivers/net/wireless/ti/wl1251/main.c +@@ -24,6 +24,9 @@ + #include <linux/firmware.h> + #include <linux/delay.h> + #include <linux/irq.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <linux/device.h> ++#endif + #include <linux/crc32.h> + #include <linux/etherdevice.h> + #include <linux/vmalloc.h> diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_spi.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_spi.patch new file mode 100644 index 00000000..97850f0d --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wl1251_spi.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/ti/wl1251/spi.c ++++ b/drivers/net/wireless/ti/wl1251/spi.c +@@ -24,6 +24,9 @@ + #include <linux/module.h> + #include <linux/slab.h> + #include <linux/crc7.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <linux/device.h> ++#endif + #include <linux/spi/spi.h> + #include <linux/wl12xx.h> + diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_event.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_event.patch new file mode 100644 index 00000000..3bc33964 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_event.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/ti/wlcore/event.c ++++ b/drivers/net/wireless/ti/wlcore/event.c +@@ -21,6 +21,7 @@ + * + */ + ++#include <linux/export.h> + #include "wlcore.h" + #include "debug.h" + #include "io.h" diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_scan.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_scan.patch new file mode 100644 index 00000000..848aa82a --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ti_wlcore_scan.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/ti/wlcore/scan.c ++++ b/drivers/net/wireless/ti/wlcore/scan.c +@@ -22,6 +22,7 @@ + */ + + #include <linux/ieee80211.h> ++#include <linux/export.h> + + #include "wlcore.h" + #include "debug.h" 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 00000000..2ba84707 --- /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 <linux/ieee80211.h> + #include <net/cfg80211.h> + #include <asm/unaligned.h> ++#include <net/if_inet6.h> + + /** + * DOC: Introduction diff --git a/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_bnep_sock.patch b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_bnep_sock.patch new file mode 100644 index 00000000..9c949d26 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_bnep_sock.patch @@ -0,0 +1,10 @@ +--- a/net/bluetooth/bnep/sock.c ++++ b/net/bluetooth/bnep/sock.c +@@ -26,6 +26,7 @@ + + #include <linux/export.h> + #include <linux/file.h> ++#include <linux/compat.h> + + #include "bnep.h" + diff --git a/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hci_sock.patch new file mode 100644 index 00000000..08d68fd6 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hci_sock.patch @@ -0,0 +1,10 @@ +--- a/net/bluetooth/hci_sock.c ++++ b/net/bluetooth/hci_sock.c +@@ -25,6 +25,7 @@ + /* Bluetooth HCI sockets. */ + + #include <linux/export.h> ++#include <linux/compat.h> + #include <asm/unaligned.h> + + #include <net/bluetooth/bluetooth.h> diff --git a/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hidp_sock.patch new file mode 100644 index 00000000..1e351761 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_bluetooth_hidp_sock.patch @@ -0,0 +1,10 @@ +--- a/net/bluetooth/hidp/sock.c ++++ b/net/bluetooth/hidp/sock.c +@@ -22,6 +22,7 @@ + + #include <linux/export.h> + #include <linux/file.h> ++#include <linux/compat.h> + + #include "hidp.h" + diff --git a/patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch new file mode 100644 index 00000000..7f8bbeb6 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch @@ -0,0 +1,12 @@ +--- a/net/mac80211/key.c ++++ b/net/mac80211/key.c +@@ -24,6 +24,9 @@ + #include "aes_ccm.h" + #include "aes_cmac.h" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++#include <asm/unaligned.h> ++#endif + + /** + * DOC: Key handling basics diff --git a/patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch new file mode 100644 index 00000000..cd7ae0e8 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch @@ -0,0 +1,9 @@ +--- a/net/mac80211/pm.c ++++ b/net/mac80211/pm.c +@@ -1,5 +1,6 @@ + #include <net/mac80211.h> + #include <net/rtnetlink.h> ++#include <linux/export.h> + + #include "ieee80211_i.h" + #include "mesh.h" diff --git a/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch b/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch new file mode 100644 index 00000000..ab9b61a5 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch @@ -0,0 +1,10 @@ +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -10,6 +10,7 @@ + #include <net/cfg80211.h> + #include <net/ip.h> + #include <net/dsfield.h> ++#include <asm/unaligned.h> + #include "core.h" + #include "rdev-ops.h" + |