Commit 74c7dbe0 authored by David S. Miller's avatar David S. Miller

Merge branch 'ionic-tx-updates'

Shannon Nelson says:

====================
ionic Tx updates

Just as the Rx path recently got a face lift, it is time for the Tx path to
get some attention.  The original TSO-to-descriptor mapping was ugly and
convoluted and needed some deep work.  This series pulls the dma mapping
out of the descriptor frag mapping loop and makes the dma mapping more
generic for use in the non-TSO case.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 578ce046 633eddf1
...@@ -179,8 +179,11 @@ struct ionic_buf_info { ...@@ -179,8 +179,11 @@ struct ionic_buf_info {
struct page *page; struct page *page;
dma_addr_t dma_addr; dma_addr_t dma_addr;
u32 page_offset; u32 page_offset;
u32 len;
}; };
#define IONIC_MAX_FRAGS (1 + IONIC_TX_MAX_SG_ELEMS_V1)
struct ionic_desc_info { struct ionic_desc_info {
union { union {
void *desc; void *desc;
...@@ -193,8 +196,9 @@ struct ionic_desc_info { ...@@ -193,8 +196,9 @@ struct ionic_desc_info {
struct ionic_txq_sg_desc *txq_sg_desc; struct ionic_txq_sg_desc *txq_sg_desc;
struct ionic_rxq_sg_desc *rxq_sgl_desc; struct ionic_rxq_sg_desc *rxq_sgl_desc;
}; };
unsigned int bytes;
unsigned int nbufs; unsigned int nbufs;
struct ionic_buf_info bufs[IONIC_RX_MAX_SG_ELEMS + 1]; struct ionic_buf_info bufs[IONIC_MAX_FRAGS];
ionic_desc_cb cb; ionic_desc_cb cb;
void *cb_arg; void *cb_arg;
}; };
......
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