2021-07-15 16:56:01

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] mac80211: include <linux/rbtree.h>

From: Johannes Berg <[email protected]>

This is needed for the rbtree, and we shouldn't just rely
on it getting included somewhere implicitly. Include it
explicitly.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/ieee80211_i.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 22549b95d1aa..1c14cecf9813 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -25,6 +25,7 @@
#include <linux/leds.h>
#include <linux/idr.h>
#include <linux/rhashtable.h>
+#include <linux/rbtree.h>
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
--
2.31.1


2021-07-19 12:32:03

by Toke Høiland-Jørgensen

[permalink] [raw]
Subject: Re: [PATCH] mac80211: include <linux/rbtree.h>

Johannes Berg <[email protected]> writes:

> From: Johannes Berg <[email protected]>
>
> This is needed for the rbtree, and we shouldn't just rely
> on it getting included somewhere implicitly. Include it
> explicitly.
>
> Signed-off-by: Johannes Berg <[email protected]>

Does this need a Fixes: tag?

Acked-by: Toke Høiland-Jørgensen <[email protected]>

2021-07-19 12:35:07

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: include <linux/rbtree.h>

On Mon, 2021-07-19 at 14:31 +0200, Toke Høiland-Jørgensen wrote:
> Johannes Berg <[email protected]> writes:
>
> > From: Johannes Berg <[email protected]>
> >
> > This is needed for the rbtree, and we shouldn't just rely
> > on it getting included somewhere implicitly. Include it
> > explicitly.
> >
> > Signed-off-by: Johannes Berg <[email protected]>
>
> Does this need a Fixes: tag?

We seem to always get it implicitly in the current kernel, so I guess
not really necessary to backport or anything, I'd say no.

I just ran into it while preparing a new backports import to our
internal tree.

johannes

2021-07-19 12:39:47

by Toke Høiland-Jørgensen

[permalink] [raw]
Subject: Re: [PATCH] mac80211: include <linux/rbtree.h>

Johannes Berg <[email protected]> writes:

> On Mon, 2021-07-19 at 14:31 +0200, Toke Høiland-Jørgensen wrote:
>> Johannes Berg <[email protected]> writes:
>>
>> > From: Johannes Berg <[email protected]>
>> >
>> > This is needed for the rbtree, and we shouldn't just rely
>> > on it getting included somewhere implicitly. Include it
>> > explicitly.
>> >
>> > Signed-off-by: Johannes Berg <[email protected]>
>>
>> Does this need a Fixes: tag?
>
> We seem to always get it implicitly in the current kernel, so I guess
> not really necessary to backport or anything, I'd say no.
>
> I just ran into it while preparing a new backports import to our
> internal tree.

Alright, fair enough :)

-Toke