diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2010-01-07 11:05:05 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 12:53:08 +0100 |
| commit | 924cc2680fbe181066ec138d369691d28d913ea2 (patch) | |
| tree | 009d3b28ddf2ebc9466b882fd8170ea97e6d8a73 /drivers/staging/octeon/ethernet.c | |
| parent | 3368c784bcf77124aaf39372e627016c36bd4472 (diff) | |
| download | op-kernel-dev-924cc2680fbe181066ec138d369691d28d913ea2.zip op-kernel-dev-924cc2680fbe181066ec138d369691d28d913ea2.tar.gz | |
Staging: Octeon Ethernet: Enable scatter-gather.
Octeon ethernet hardware can handle NETIF_F_SG, so we enable it.
A gather list of up to six fragments will fit in the SKB's CB
structure, so no extra memory is required. If a SKB has more than six
fragments, we must linearize it.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
To: gregkh@suse.de
Patchwork: http://patchwork.linux-mips.org/patch/838/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 9f5b741..9d63202 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -484,8 +484,11 @@ int cvm_oct_common_init(struct net_device *dev) && (always_use_pow || strstr(pow_send_list, dev->name))) priv->queue = -1; - if (priv->queue != -1 && USE_HW_TCPUDP_CHECKSUM) - dev->features |= NETIF_F_IP_CSUM; + if (priv->queue != -1) { + dev->features |= NETIF_F_SG; + if (USE_HW_TCPUDP_CHECKSUM) + dev->features |= NETIF_F_IP_CSUM; + } /* We do our own locking, Linux doesn't need to */ dev->features |= NETIF_F_LLTX; |
