| Message ID | 20230519083848.58828-1-jiapeng.chong@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | iavf: Remove useless else if | expand |
On Fri, May 19, 2023 at 04:38:48PM +0800, Jiapeng Chong wrote: > The assignment of the else and if branches is the same, so the if else > here is redundant, so we remove it. > > ./drivers/net/ethernet/intel/iavf/iavf_main.c:2203:6-8: WARNING: possible condition with no effect (if == else). > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=5255 > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> nit: This should be targeted at net-next. Subject: [PATCH net-next] ... > --- > drivers/net/ethernet/intel/iavf/iavf_main.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c > index 2de4baff4c20..cf8538cebfe0 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_main.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c > @@ -2200,8 +2200,6 @@ iavf_set_vlan_offload_features(struct iavf_adapter *adapter, > vlan_ethertype = ETH_P_8021Q; > else if (prev_features & (NETIF_F_HW_VLAN_STAG_RX | NETIF_F_HW_VLAN_STAG_TX)) > vlan_ethertype = ETH_P_8021AD; > - else if (prev_features & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX)) > - vlan_ethertype = ETH_P_8021Q; I agree that the assignment is the same. But the current arrangement does very obviously handle NETIF_F_HW_VLAN_CTAG_TX, whereas in the new arrangement it's unclear if it is handled or forgotten. Perhaps a comment is warranted here? Something like this? > else /* This covers both the default and the * (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX case. */ > vlan_ethertype = ETH_P_8021Q; > > -- > 2.20.1.7.g153144c > >
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 2de4baff4c20..cf8538cebfe0 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -2200,8 +2200,6 @@ iavf_set_vlan_offload_features(struct iavf_adapter *adapter, vlan_ethertype = ETH_P_8021Q; else if (prev_features & (NETIF_F_HW_VLAN_STAG_RX | NETIF_F_HW_VLAN_STAG_TX)) vlan_ethertype = ETH_P_8021AD; - else if (prev_features & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX)) - vlan_ethertype = ETH_P_8021Q; else vlan_ethertype = ETH_P_8021Q;
The assignment of the else and if branches is the same, so the if else here is redundant, so we remove it. ./drivers/net/ethernet/intel/iavf/iavf_main.c:2203:6-8: WARNING: possible condition with no effect (if == else). Reported-by: Abaci Robot <abaci@linux.alibaba.com> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=5255 Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> --- drivers/net/ethernet/intel/iavf/iavf_main.c | 2 -- 1 file changed, 2 deletions(-)