diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2013-03-30 00:53:58 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes@sipsolutions.net> | 2013-03-30 01:06:36 +0100 |
| commit | 44706a520f6527c67e7f8b741812f11464babda2 (patch) | |
| tree | ceba8de9f18d05fea9bb4d337391ed79a2bc7cf4 /patches/collateral-evolutions/network/66-uapi-changes | |
| parent | 5bf870f42dc0cf3e31522e05119c0a8f993a280e (diff) | |
split patches
This splits all patches into per-file patches. I've added the little
tool I wrote as well (but it's hard to use).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/network/66-uapi-changes')
| -rw-r--r-- | patches/collateral-evolutions/network/66-uapi-changes/INFO | 18 | ||||
| -rw-r--r-- | patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/66-uapi-changes/INFO b/patches/collateral-evolutions/network/66-uapi-changes/INFO new file mode 100644 index 00000000..aac02254 --- /dev/null +++ b/patches/collateral-evolutions/network/66-uapi-changes/INFO @@ -0,0 +1,18 @@ +The UAPI changes split up the kernel and userspace API +headers into separate directories. We provide backport +support for the new rfkill module to kernels older than +2.6.31. To allow us to dynamically provide only backport +support for those kernels we have a trick within compat +to provide its own include/linux/rfkill.h header which +then will include either your own kernel's rkfill.h or +include the one we are taking from linux-next. The one +we take from linux-next is renamed to rfkill_backport.h. +In order to allow the call to include your own kernel's +rfkill.h the compat rfkill.h uses include_next. The UAPI +changes would mean though that instead of getting your +own kernel's rfkill.h you'd end up getting the UAPI +header file. Fix this by ensuring that for new kernels +we linux_next into the user's kernels rfkill.h and if +the kernel is old we still to the rfkill_backport.h +naming scheme. + 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 new file mode 100644 index 00000000..f5d69d4f --- /dev/null +++ b/patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.h @@ -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 <uapi/linux/rfkill.h> ++#include <uapi/linux/rfkill_backport.h> + + /* don't allow anyone to use these in the kernel */ + enum rfkill_user_states { |