2022-08-12 09:49:28

by Lukas Bulwahn

Subject: [PATCH] wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()

Commit 177577dbd223 ("wifi: mac80211: sta_info: fix link_sta insertion")
makes ieee80211_sta_activate_link() return 0 in the 'hash' label case.
Hence, setting ret in the !test_sta_flag(...) branch to zero is not needed
anymore and can be dropped.

Remove a needless assignment.

No functional change. No change in object code.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
net/mac80211/sta_info.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index cb23da9aff1e..492c7a29d797 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2778,7 +2778,6 @@ int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id)
sta->sta.valid_links = new_links;

if (!test_sta_flag(sta, WLAN_STA_INSERTED)) {
- ret = 0;
goto hash;
}

--
2.17.1

2022-08-12 10:08:26

by Dan Carpenter

Subject: Re: [PATCH] wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()

On Fri, Aug 12, 2022 at 11:44:38AM +0200, Lukas Bulwahn wrote:
> Commit 177577dbd223 ("wifi: mac80211: sta_info: fix link_sta insertion")
> makes ieee80211_sta_activate_link() return 0 in the 'hash' label case.
> Hence, setting ret in the !test_sta_flag(...) branch to zero is not needed
> anymore and can be dropped.
>
> Remove a needless assignment.
>
> No functional change. No change in object code.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
> ---
> net/mac80211/sta_info.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> index cb23da9aff1e..492c7a29d797 100644
> --- a/net/mac80211/sta_info.c
> +++ b/net/mac80211/sta_info.c
> @@ -2778,7 +2778,6 @@ int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id)
> sta->sta.valid_links = new_links;
>
> if (!test_sta_flag(sta, WLAN_STA_INSERTED)) {
> - ret = 0;
> goto hash;
> }

Please, remove the {} as well.

regards,
dan carpenter

2022-08-12 10:35:05

by Lukas Bulwahn

Subject: Re: [PATCH] wifi: mac80211: clean up a needless assignment in ieee80211_sta_activate_link()

On Fri, Aug 12, 2022 at 12:02 PM Dan Carpenter <[email protected]> wrote:
>
> On Fri, Aug 12, 2022 at 11:44:38AM +0200, Lukas Bulwahn wrote:
> > Commit 177577dbd223 ("wifi: mac80211: sta_info: fix link_sta insertion")
> > makes ieee80211_sta_activate_link() return 0 in the 'hash' label case.
> > Hence, setting ret in the !test_sta_flag(...) branch to zero is not needed
> > anymore and can be dropped.
> >
> > Remove a needless assignment.
> >
> > No functional change. No change in object code.
> >
> > Signed-off-by: Lukas Bulwahn <[email protected]>
> > ---
> > net/mac80211/sta_info.c | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> > index cb23da9aff1e..492c7a29d797 100644
> > --- a/net/mac80211/sta_info.c
> > +++ b/net/mac80211/sta_info.c
> > @@ -2778,7 +2778,6 @@ int ieee80211_sta_activate_link(struct sta_info *sta, unsigned int link_id)
> > sta->sta.valid_links = new_links;
> >
> > if (!test_sta_flag(sta, WLAN_STA_INSERTED)) {
> > - ret = 0;
> > goto hash;
> > }
>
> Please, remove the {} as well.
>

Thanks for the pointer, Dan! I need to remember that for the future; I
did expect checkpatch to warn me of such a stylistic pattern, but it
seems that it does not. So I just need to have an eye on that.

Patch v2 sent out:
https://lore.kernel.org/lkml/[email protected]/

Lukas