Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <f210cf2a6e3f62156ae6a9d6c7de20e16bd4d6e6.camel@sipsolutions.net>
Subject: Re: [PATCH 01/15] mac80211: split bss_info_changed method
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Wen Gong <quic_wgong@quicinc.com>, linux-wireless@vger.kernel.org
Cc:     ath11k@lists.infradead.org, ath12k@lists.infradead.org
Date:   Tue, 18 Oct 2022 11:51:55 +0200
In-Reply-To: <7e72034a-497a-000c-d7bf-3ec974af9e1c@quicinc.com>
References: <20220601073958.8345-1-johannes@sipsolutions.net>
         <20220601093922.347d47c279fe.I15937cfe8405999084f164ddf57390f8b8d2bc61@changeid>
         <c38b4da8-488b-2d09-631a-1bb6c07440a6@quicinc.com>
         <3483d05c1d5a39b9243b54d9f28450344a897655.camel@sipsolutions.net>
         <bd6545a8-57a3-5849-52d5-c1a449ab1712@quicinc.com>
         <d0994456d3a9ea00b5cc472df7822d53d189399e.camel@sipsolutions.net>
         <7e72034a-497a-000c-d7bf-3ec974af9e1c@quicinc.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Tue, 2022-10-18 at 17:50 +0800, Wen Gong wrote:
> >=20
> > https://p.sipsolutions.net/0652bbbbe350b126.txt
>=20
> Conflict happened while run "git am" the patch.
>=20
> Because missing the=C2=A0 "changed |=3D BSS_CHANGED_EHT_PUNCTURING;" in m=
y=20
> local code,
>=20
> also it is missing in=20
> https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.gi=
t/tree/net/mac80211/util.c
>=20
> Maybe "changed |=3D BSS_CHANGED_EHT_PUNCTURING;" is only existed in your=
=20
> local code?
>=20

Ah yes, we didn't upstream that because there's still this discussion
about handling puncturing. But you can probably apply around that.

johannes