Re: backports spatch question
Ben Greear <[email protected]>
| Newsgroups | org.kernel.vger.backports |
|---|---|
| Organization | Candela Technologies |
| Message-ID | <[email protected]> |
On 7/5/21 12:32 PM, Johannes Berg wrote: > On Mon, 2021-07-05 at 12:32 -0700, Ben Greear wrote: >> On 7/5/21 12:26 PM, Johannes Berg wrote: >>> On Mon, 2021-07-05 at 12:26 -0700, Ben Greear wrote: >>>> On 7/5/21 12:19 PM, Johannes Berg wrote: >>>>> On Mon, 2021-07-05 at 12:17 -0700, Ben Greear wrote: >>>>>> >>>>>> Did you test it? >>>>>> >>>>> >>>>> Yes, pretty sure we do it basically all the time. We don't have kernels >>>>> that new yet in most of our test setups. >>>>> >>>>>> Because that should be logically identical to what I tried if I read this file properly: >>>>> >>>>> Actually, your version might be more correct than ours ... >>>>> >>>>> I dunno. I note we also have an <linux/rfkill.h> include in cfg80211.h, >>>>> but that should be there upstream too, so not sure. >>>> >>>> There are a lot of rfkill.h files, what logic makes the backports code include the specific >>>> backport/backport-include/linux/rfkill.h file? I suspect that isn't working for the cfg80211.h >>>> file for whatever reason. >>> >>> It's just an additional -I flag on the compiler command line, or - >>> isystem or something like that. >>> >>> johannes >>> >> >> my cfg80211.h shows this line: >> >> #include <uapi/linux/rfkill.h> > > Not a later <linux/rfkill.h> line? We have one like that in our version > ... > > I guess we should really only have the <linux/rfkill.h> one, but since > we want the function declaration, we really ought to have that? > > johannes > > This got me further....will debug next problem now... [greearb@ben-dt4 linux-5.13.dev.y]$ git show commit 2c307ff3476bdedd76b2929028b3a9cdc9a42620 (HEAD -> master, origin/master, origin/HEAD) Author: Ben Greear <[email protected]> Date: Mon Jul 5 12:52:11 2021 -0700 cfg80211: Include linux/rfkill.h, not uapi/linux/rfkill.h This should help when using the kernel with backports. Signed-off-by: Ben Greear <[email protected]> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 49154fb347e7..cf41d75b23d2 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -11,7 +11,7 @@ */ #include <linux/ethtool.h> -#include <uapi/linux/rfkill.h> +#include <linux/rfkill.h> #include <linux/netdevice.h> #include <linux/debugfs.h> #include <linux/list.h> -- Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com -- To unsubscribe from this list: send the line "unsubscribe backports" in