| Message ID | 20190306081234.GC2625@kadam |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: hns3: Fix a logical vs bitwise typo | expand |
On 2019/3/6 16:12, Dan Carpenter wrote: > There were a couple logical ORs accidentally mixed in with the bitwise > ORs. Thanks for the fix. Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com> > > Fixes: e8149933b1fa ("net: hns3: remove hnae3_get_bit in data path") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > Very recent bug. > > drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > index 3cb43b1f1c2e..1e4efc47c7a5 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > @@ -2321,8 +2321,8 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, > if (!(bd_base_info & BIT(HNS3_RXD_L3L4P_B))) > return; > > - if (unlikely(l234info & (BIT(HNS3_RXD_L3E_B) | BIT(HNS3_RXD_L4E_B) || > - BIT(HNS3_RXD_OL3E_B) || > + if (unlikely(l234info & (BIT(HNS3_RXD_L3E_B) | BIT(HNS3_RXD_L4E_B) | > + BIT(HNS3_RXD_OL3E_B) | > BIT(HNS3_RXD_OL4E_B)))) { > u64_stats_update_begin(&ring->syncp); > ring->stats.l3l4_csum_err++; >
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 6 Mar 2019 11:12:34 +0300 > There were a couple logical ORs accidentally mixed in with the bitwise > ORs. > > Fixes: e8149933b1fa ("net: hns3: remove hnae3_get_bit in data path") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > Very recent bug. Applied.
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 3cb43b1f1c2e..1e4efc47c7a5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2321,8 +2321,8 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, if (!(bd_base_info & BIT(HNS3_RXD_L3L4P_B))) return; - if (unlikely(l234info & (BIT(HNS3_RXD_L3E_B) | BIT(HNS3_RXD_L4E_B) || - BIT(HNS3_RXD_OL3E_B) || + if (unlikely(l234info & (BIT(HNS3_RXD_L3E_B) | BIT(HNS3_RXD_L4E_B) | + BIT(HNS3_RXD_OL3E_B) | BIT(HNS3_RXD_OL4E_B)))) { u64_stats_update_begin(&ring->syncp); ring->stats.l3l4_csum_err++;
There were a couple logical ORs accidentally mixed in with the bitwise ORs. Fixes: e8149933b1fa ("net: hns3: remove hnae3_get_bit in data path") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- Very recent bug. drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)