diff options
| author | Michael Chan | 2016-02-22 08:10:26 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-02-24 01:12:51 +0100 |
| commit | fbb0fa8b48892a3db8f5b89fb591c741fbd2fe7a (patch) | |
| tree | d60189acd5cb20688c21462d08fb774f6c56ebed /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | tunnel: Clear IPCB(skb)->opt before dst_link_failure called (diff) | |
| download | kernel-qcow2-linux-fbb0fa8b48892a3db8f5b89fb591c741fbd2fe7a.tar.gz kernel-qcow2-linux-fbb0fa8b48892a3db8f5b89fb591c741fbd2fe7a.tar.xz kernel-qcow2-linux-fbb0fa8b48892a3db8f5b89fb591c741fbd2fe7a.zip | |
bnxt_en: Fix zero padding of tx push data.
The arithmetic to zero pad the last 64-bit word in the push buffer is not
correct.
1. It should be pdata + length to get to the end.
2. 'pdata' is void pointer and passing it to PTR_ALIGN() will cast the
aligned pointer to void. Pass 'end' which is u64 pointer to PTR_ALIGN()
instead so that the aligned pointer - 1 is the last 64-bit pointer to data.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 8ab000dd52d9..82f191382989 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -248,7 +248,8 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) tx_push1->tx_bd_cfa_meta = cpu_to_le32(vlan_tag_flags); tx_push1->tx_bd_cfa_action = cpu_to_le32(cfa_action); - end = PTR_ALIGN(pdata + length + 1, 8) - 1; + end = pdata + length; + end = PTR_ALIGN(end, 8) - 1; *end = 0; skb_copy_from_linear_data(skb, pdata, len); |