| Message ID | 20230604120651.1b01fef7c81f.Ib6492fe29fe31807b2fe31a84734b55d74b5c314@changeid (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | cfg80211/mac80211 patches from our internal tree 2023-06-04 | expand |
On Sun Jun 4, 2023 at 11:11 AM CEST, wrote: > From: Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com> > > Make "changed" to be u64 as implied by the corresponding enum size. > > Fixes: 61513162aa2d ("wifi: mac80211: mlme: shift some code around") > Signed-off-by: Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com> > Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> > --- > net/mac80211/cfg.c | 2 +- > net/mac80211/chan.c | 2 +- > net/mac80211/ieee80211_i.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c > index 7317e4a5d1ff..49f5122189d3 100644 > --- a/net/mac80211/cfg.c > +++ b/net/mac80211/cfg.c > @@ -5,7 +5,7 @@ > * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> > * Copyright 2013-2015 Intel Mobile Communications GmbH > * Copyright (C) 2015-2017 Intel Deutschland GmbH > - * Copyright (C) 2018-2022 Intel Corporation > + * Copyright (C) 2018-2023 Intel Corporation > */ > > #include <linux/ieee80211.h> > diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c > index 77c90ed8f5d7..a7e204de5d54 100644 > --- a/net/mac80211/chan.c > +++ b/net/mac80211/chan.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > * mac80211 - channel management > - * Copyright 2020 - 2022 Intel Corporation > + * Copyright 2020 - 2023 Intel Corporation > */ > > #include <linux/nl80211.h> > diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h > index e67c5c754be1..886244d42f04 100644 > --- a/net/mac80211/ieee80211_i.h > +++ b/net/mac80211/ieee80211_i.h > @@ -5,7 +5,7 @@ > * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> > * Copyright 2007-2010 Johannes Berg <johannes@sipsolutions.net> > * Copyright 2013-2015 Intel Mobile Communications GmbH > - * Copyright (C) 2018-2022 Intel Corporation > + * Copyright (C) 2018-2023 Intel Corporation > */ > > #ifndef IEEE80211_I_H Hi there, Did I miss something or there's no code in this one but just copyright updates ? --- Nicolas E.
On Tue, 2023-06-06 at 15:18 +0200, Nicolas Escande wrote: > > Did I miss something or there's no code in this one but just copyright updates ? > Yeah ... I already dropped the patch. Apparently Gregory missed, when transferring from our tree to upstream, that these changes had already been rolled up or done elsewhere. johannes
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 7317e4a5d1ff..49f5122189d3 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -5,7 +5,7 @@ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> * Copyright 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include <linux/ieee80211.h> diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 77c90ed8f5d7..a7e204de5d54 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * mac80211 - channel management - * Copyright 2020 - 2022 Intel Corporation + * Copyright 2020 - 2023 Intel Corporation */ #include <linux/nl80211.h> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index e67c5c754be1..886244d42f04 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -5,7 +5,7 @@ * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> * Copyright 2007-2010 Johannes Berg <johannes@sipsolutions.net> * Copyright 2013-2015 Intel Mobile Communications GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #ifndef IEEE80211_I_H