Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> writes: > This patch fixes incorrect code alignment. > > ./drivers/net/wireless/intel/ipw2x00/libipw_rx.c:871:2-3: code aligned with following code on line 882. > ./drivers/net/wireless/intel/ipw2x00/libipw_rx.c:886:2-3: code aligned with following code on line 900. > > Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=11381 > Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> > --- > Changes in v2: > -Replace the & in the if statement with &&. Add 'wifi: ' to subject. > > .../net/wireless/intel/ipw2x00/libipw_rx.c | 44 +++++++++---------- > 1 file changed, 22 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_rx.c b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c > index 7e41cb7bbfe0..38731f67cb54 100644 > --- a/drivers/net/wireless/intel/ipw2x00/libipw_rx.c > +++ b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c > @@ -868,34 +868,34 @@ void libipw_rx_any(struct libipw_device *ieee, > case IW_MODE_ADHOC: > /* our BSS and not from/to DS */ > if (ether_addr_equal(hdr->addr3, ieee->bssid)) > - if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) { > - /* promisc: get all */ > - if (ieee->dev->flags & IFF_PROMISC) > - is_packet_for_us = 1; > - /* to us */ > - else if (ether_addr_equal(hdr->addr1, ieee->dev->dev_addr)) > - is_packet_for_us = 1; > - /* mcast */ > - else if (is_multicast_ether_addr(hdr->addr1)) > - is_packet_for_us = 1; > + if ((fc && (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == 0) { I meant instead of using two nested if statements you can use only one if statement with '&&' operator. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
