| Message ID | 56F78D76.1060305@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Mar 27 2016, zhaoxiu zeng wrote: > From: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> > > Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> No idea why I’ve been CC’d, but code looks good to me so: Acked-by: Michal Nazarewicz <mina86@mina86.com> > --- > drivers/net/ethernet/sun/niu.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c > index 9cc4564..8c344ef 100644 > --- a/drivers/net/ethernet/sun/niu.c > +++ b/drivers/net/ethernet/sun/niu.c > @@ -2742,18 +2742,12 @@ static int niu_set_alt_mac_rdc_table(struct niu *np, int idx, > > static u64 vlan_entry_set_parity(u64 reg_val) > { > - u64 port01_mask; > - u64 port23_mask; > - > - port01_mask = 0x00ff; > - port23_mask = 0xff00; > - > - if (hweight64(reg_val & port01_mask) & 1) > + if (parity8(reg_val)) > reg_val |= ENET_VLAN_TBL_PARITY0; > else > reg_val &= ~ENET_VLAN_TBL_PARITY0; > > - if (hweight64(reg_val & port23_mask) & 1) > + if (parity8((unsigned int)reg_val >> 8)) > reg_val |= ENET_VLAN_TBL_PARITY1; > else > reg_val &= ~ENET_VLAN_TBL_PARITY1; > -- > 2.5.5 >
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 9cc4564..8c344ef 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -2742,18 +2742,12 @@ static int niu_set_alt_mac_rdc_table(struct niu *np, int idx, static u64 vlan_entry_set_parity(u64 reg_val) { - u64 port01_mask; - u64 port23_mask; - - port01_mask = 0x00ff; - port23_mask = 0xff00; - - if (hweight64(reg_val & port01_mask) & 1) + if (parity8(reg_val)) reg_val |= ENET_VLAN_TBL_PARITY0; else reg_val &= ~ENET_VLAN_TBL_PARITY0; - if (hweight64(reg_val & port23_mask) & 1) + if (parity8((unsigned int)reg_val >> 8)) reg_val |= ENET_VLAN_TBL_PARITY1; else reg_val &= ~ENET_VLAN_TBL_PARITY1;