Commit 7988ceef authored by David S. Miller's avatar David S. Miller

Merge branch 'ftgmac100-rework-batch3-tx-path'

Benjamin Herrenschmidt says:

====================
ftgmac100: Rework batch 3 - TX path

This is version 2 of the third batch of updates to
the ftgmac100 driver.

This one tackles the TX path of the driver. This provides the
bulk of the performance improvements by adding support for
fragmented sends along with a bunch of cleanups.

Version 2 fixes a patch splitting mistake and uses
eth_skb_pad() (which uses skb_put_padto) to pad ethernet
frames rather than skb_padto(), thus removing the need to
also pad the packet headlen in a couple of places.

Subsequent batches will add various features (ethtool functions,
vlan offlan, ...) and cleanups.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eb976a55 52c0cae8
This diff is collapsed.
...@@ -202,10 +202,10 @@ ...@@ -202,10 +202,10 @@
* Transmit descriptor, aligned to 16 bytes * Transmit descriptor, aligned to 16 bytes
*/ */
struct ftgmac100_txdes { struct ftgmac100_txdes {
unsigned int txdes0; __le32 txdes0; /* Control & status bits */
unsigned int txdes1; __le32 txdes1; /* Irq, checksum and vlan control */
unsigned int txdes2; /* not used by HW */ __le32 txdes2; /* Reserved */
unsigned int txdes3; /* TXBUF_BADR */ __le32 txdes3; /* DMA buffer address */
} __attribute__ ((aligned(16))); } __attribute__ ((aligned(16)));
#define FTGMAC100_TXDES0_TXBUF_SIZE(x) ((x) & 0x3fff) #define FTGMAC100_TXDES0_TXBUF_SIZE(x) ((x) & 0x3fff)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment