diff options
| author | Colin Ian King <colin.king@canonical.com> | 2020-07-08 21:37:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-09 23:06:56 +0300 |
| commit | e3cbdaf146159d2e708e51d168fd5fab793f766b (patch) | |
| tree | c85ef5f027b9c7fa43fdbbf04f28381f5fdbe91a /drivers/net/ethernet/broadcom | |
| parent | 034508c4396919d915b14ee736d7cbdb79d6c307 (diff) | |
| download | linux-e3cbdaf146159d2e708e51d168fd5fab793f766b.tar.xz | |
net: systemport: fix double shift of a vlan_tci by VLAN_PRIO_SHIFT
Currently the u16 skb->vlan_tci is being right shifted twice by
VLAN_PRIO_SHIFT, once in the macro skb_vlan_tag_get_pri and explicitly
by VLAN_PRIO_SHIFT afterwards. The combined shift amount is larger than
the u16 so the end result is always zero. Remove the second explicit
shift as this is extraneous.
Fixes: 6e9fdb60d362 ("net: systemport: Add support for VLAN transmit acceleration")
Addresses-Coverity: ("Operands don't affect result")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index b470551bae4f..dfed9ade6950 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1250,8 +1250,7 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb, memset(tsb, 0, sizeof(*tsb)); if (skb_vlan_tag_present(skb)) { - tsb->pcp_dei_vid = (skb_vlan_tag_get_prio(skb) >> - VLAN_PRIO_SHIFT & PCP_DEI_MASK); + tsb->pcp_dei_vid = skb_vlan_tag_get_prio(skb) & PCP_DEI_MASK; tsb->pcp_dei_vid |= (u32)skb_vlan_tag_get_id(skb) << VID_SHIFT; } |