diff options
| author | Cristian Sovaiala <cristian.sovaiala@freescale.com> | 2015-03-27 09:09:41 (GMT) |
|---|---|---|
| committer | Madalin-Cristian Bucur <madalin.bucur@freescale.com> | 2015-03-30 11:16:20 (GMT) |
| commit | ca9053e8767bebc8e1429b79a2db1a6676c22a8b (patch) | |
| tree | f194512903dca663c910f142f3b4a8e20c8a4bb5 /drivers/net/ethernet/freescale/dpa | |
| parent | 6b0c162fad2ba1b59258dd9cb002f18f58450f46 (diff) | |
| download | linux-fsl-qoriq-ca9053e8767bebc8e1429b79a2db1a6676c22a8b.tar.xz | |
dpaa_eth: Remove Jumbo frame verification
The check must be added in the RX hook instead of conditioning the
call of the hook based on the frame size.
The hooks might be utilized by multiple drivers therefore each must add
its specific checks inside the hooks.
Signed-off-by: Cristian Sovaiala <cristian.sovaiala@freescale.com>
Change-Id: I9f1ee9321bad4b6c9c38fdc332a0a8785153f81b
Reviewed-on: http://git.am.freescale.net:8181/33684
Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
Tested-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c index 4f069ce..daa75cf 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c @@ -578,21 +578,14 @@ void __hot _dpa_rx(struct net_device *net_dev, if (likely(fd->format == qm_fd_contig)) { #if defined(CONFIG_AS_FASTPATH) || defined(CONFIG_FSL_FMAN_TEST) -#if defined(CONFIG_AS_FASTPATH) && !defined(CONFIG_FSL_DPAA_ETH_JUMBO_FRAME) - /* Do not allow Jumbo packet to ASF */ - if (likely(fd->length20 <= 1514)) { -#endif - /* Execute the Rx processing hook, if it exists. */ - if (dpaa_eth_hooks.rx_default && - dpaa_eth_hooks.rx_default((void *)fd, net_dev, - fqid) == DPAA_ETH_STOLEN) { - /* won't count the rx bytes in */ - return; - } -#if defined(CONFIG_AS_FASTPATH) && !defined(CONFIG_FSL_DPAA_ETH_JUMBO_FRAME) + /* Execute the Rx processing hook, if it exists. */ + if (dpaa_eth_hooks.rx_default && + dpaa_eth_hooks.rx_default((void *)fd, net_dev, + fqid) == DPAA_ETH_STOLEN) { + /* won't count the rx bytes in */ + return; } #endif -#endif skb = contig_fd_to_skb(priv, fd, &use_gro); } else skb = sg_fd_to_skb(priv, fd, &use_gro, count_ptr); |