From: Hauke Mehrtens <hauke@hauke-m.de>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>
Cc: backports@vger.kernel.org
Subject: Re: [PATCH 5/6] compat-drivers: add import to fix compile error
Date: Thu, 29 Nov 2012 20:50:09 +0100 [thread overview]
Message-ID: <50B7BC71.4040004@hauke-m.de> (raw)
In-Reply-To: <CAB=NE6VTooMH=mtDOiSw57DXez4E__nwrU_E=R3BHeXZ9jF1LQ@mail.gmail.com>
On 11/29/2012 08:25 PM, Luis R. Rodriguez wrote:
> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On kernel version <= 2.6.28, I saw the following compile error without
>> this patch:
>>
>> /net/wireless/util.c: In function ‘cfg80211_get_p2p_attr’:
>> /net/wireless/util.c:1120:4: error: implicit declaration of function
>> ‘get_unaligned_le16’ [-Werror=implicit-function-declaration]
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>> patches/network/06-header-changes.patch | 10 ++++++++++
>> patches/network/30-bridge-port.patch | 2 +-
>> 2 files changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/patches/network/06-header-changes.patch b/patches/network/06-header-changes.patch
>> index cd587cd..5da05c0 100644
>> --- a/patches/network/06-header-changes.patch
>> +++ b/patches/network/06-header-changes.patch
>> @@ -125,3 +125,13 @@ cases.
>>
>> #define USB_VERSION "1.0"
>>
>> +--- 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>
>
> Interesting, I wonder if we should just get a compat header to add
> this therefore not requiring any patching.
Probably some of the header files included also include asm/unaligned.h
on kernel versions > 2.6.28. You could add all the includes added in
this patch to compat-X.h to get rid of this entire patch, but this will
increase the risk of name clashes.
>> + #include "core.h"
>> + #include "rdev-ops.h"
>> +
>> diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-bridge-port.patch
>> index b4106b7..a426274 100644
>> --- a/patches/network/30-bridge-port.patch
>> +++ b/patches/network/30-bridge-port.patch
>> @@ -23,7 +23,7 @@ compat-drivers.
>>
>> --- a/net/wireless/util.c
>> +++ b/net/wireless/util.c
>> -@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
>> +@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
>> return -EOPNOTSUPP;
>>
>
> This hunk does not seem to be relevant so I'll discard it.
The offset of this change in the patch changed because of the additional
header being added in the previous patch. I am always refreshing the
patches after doing some changes to them to make all apply cleanly.
Hauke
next prev parent reply other threads:[~2012-11-29 19:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 1/6] compat-drivers: make patches apply again Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 2/6] compat-drivers: remove option for alx driver Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 3/6] compat-drivers: build RTL8723AE Hauke Mehrtens
2012-11-29 21:08 ` Luis R. Rodriguez
2012-11-29 21:21 ` Julia Lawall
2012-11-29 21:30 ` Luis R. Rodriguez
2012-11-29 21:36 ` Julia Lawall
2012-11-29 21:46 ` Hauke Mehrtens
2012-11-29 21:53 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 4/6] compat-drivers: refresh patches Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 5/6] compat-drivers: add import to fix compile error Hauke Mehrtens
2012-11-29 19:25 ` Luis R. Rodriguez
2012-11-29 19:50 ` Hauke Mehrtens [this message]
2012-11-29 19:57 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 6/6] compat-drivers: do not use struct spinlock Hauke Mehrtens
2012-11-29 19:47 ` Luis R. Rodriguez
2012-11-29 20:51 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50B7BC71.4040004@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=mcgrof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.