Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <37ccff43592353f2dabcf1fa6d050fa5d23b18d9.camel@coelho.fi>
From:   Luca Coelho <luca@coelho.fi>
To:     Florian Fainelli <f.fainelli@gmail.com>, johannes@sipsolutions.net
Cc:     linux-wireless@vger.kernel.org
Date:   Wed, 23 Jun 2021 14:04:03 +0300
In-Reply-To: <f0b8bcb1e90c4e805db974674e07f55e2ee38c14.camel@coelho.fi>
References: <20210618104156.747775-1-luca@coelho.fi>
         <iwlwifi.20210618133832.5b2063dea3b3.I56248f2ce2e22a5c0cf797378726f6904b5de5e2@changeid>
         <db8585de-f1a2-b40c-0e4d-30dc5ad1d6ae@gmail.com>
         <f0b8bcb1e90c4e805db974674e07f55e2ee38c14.camel@coelho.fi>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.38.3-1 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [PATCH 02/31] mac80211: do not add twice the HE 6GHz cap IE
Precedence: bulk

On Fri, 2021-06-18 at 23:17 +0300, Luca Coelho wrote:
> On Fri, 2021-06-18 at 10:14 -0700, Florian Fainelli wrote:
> > 
> > On 6/18/2021 3:41 AM, Luca Coelho wrote:
> > > From: Shaul Triebitz <shaul.triebitz@intel.com>
> > > 
> > > The HE 6GHz capability IE is already added before:
> > > ieee80211_add_he_ie -> ieee80211_ie_build_he_6ghz_cap
> > > 
> > > Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
> > > Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> > > ---
> > >  net/mac80211/mlme.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> > > index 2480bd0577bb..310cfd02fda4 100644
> > > --- a/net/mac80211/mlme.c
> > > +++ b/net/mac80211/mlme.c
> > > @@ -8,7 +8,7 @@
> > >   * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
> > >   * Copyright 2013-2014  Intel Mobile Communications GmbH
> > >   * Copyright (C) 2015 - 2017 Intel Deutschland GmbH
> > > - * Copyright (C) 2018 - 2020 Intel Corporation
> > > + * Copyright (C) 2018 - 2021 Intel Corporation
> > 
> > This change only bumps the copyright year...
> 
> Oops, something went wrong when I applied it.  I'll check and either
> resend or drop it.

Please drop this patch.  It was an internal fixed to a merge damage and
should not have been sent out (obviously because it resulted in no
code).

--
Cheers,
Luca.