diff options
| author |   Jose Abreu <Jose.Abreu@synopsys.com> | 2019-11-06 16:02:58 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-06 21:22:55 -0800 |
| commit | 96147375d49f9b523e6462992ddcfb753835c42f (patch) | |
| tree | fee4804982e757070ad0701d78bd67638aaee9d6 /drivers/net/ethernet/stmicro | |
| parent | net: stmmac: selftests: Prevent false positives in filter tests (diff) | |
| download | linux-dev-96147375d49f9b523e6462992ddcfb753835c42f.tar.xz linux-dev-96147375d49f9b523e6462992ddcfb753835c42f.zip | |
net: stmmac: xgmac: Only get SPH header len if available
Split Header length is only available when L34T == 0. Fix this by
correctly checking if L34T is zero before trying to get Header length.
Fixes: 67afd6d1cfdf ("net: stmmac: Add Split Header support and enable it in XGMAC cores")
Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c index ae48154f933c..bd5838ce1e8a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c @@ -288,7 +288,8 @@ static int dwxgmac2_get_rx_hash(struct dma_desc *p, u32 *hash, static int dwxgmac2_get_rx_header_len(struct dma_desc *p, unsigned int *len) { - *len = le32_to_cpu(p->des2) & XGMAC_RDES2_HL; + if (le32_to_cpu(p->des3) & XGMAC_RDES3_L34T) + *len = le32_to_cpu(p->des2) & XGMAC_RDES2_HL; return 0; } |