Commit 49f5eea8 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller

net: lan966x: Add len field to lan966x_tx_dcb_buf

Currently when a frame was transmitted, it is required to unamp the
frame that was transmitted. The length of the frame was taken from the
transmitted skb. In the future we might not have an skb, therefore store
the length skb directly in the lan966x_tx_dcb_buf and use this one to
unamp the frame.
While at this, also arrange the members in lan966x_tx_dcb_buf not to
have any holes.
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d66bc57
...@@ -391,12 +391,12 @@ static void lan966x_fdma_tx_clear_buf(struct lan966x *lan966x, int weight) ...@@ -391,12 +391,12 @@ static void lan966x_fdma_tx_clear_buf(struct lan966x *lan966x, int weight)
continue; continue;
dcb_buf->dev->stats.tx_packets++; dcb_buf->dev->stats.tx_packets++;
dcb_buf->dev->stats.tx_bytes += dcb_buf->skb->len; dcb_buf->dev->stats.tx_bytes += dcb_buf->len;
dcb_buf->used = false; dcb_buf->used = false;
dma_unmap_single(lan966x->dev, dma_unmap_single(lan966x->dev,
dcb_buf->dma_addr, dcb_buf->dma_addr,
dcb_buf->skb->len, dcb_buf->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (!dcb_buf->ptp) if (!dcb_buf->ptp)
dev_kfree_skb_any(dcb_buf->skb); dev_kfree_skb_any(dcb_buf->skb);
...@@ -709,6 +709,7 @@ int lan966x_fdma_xmit(struct sk_buff *skb, __be32 *ifh, struct net_device *dev) ...@@ -709,6 +709,7 @@ int lan966x_fdma_xmit(struct sk_buff *skb, __be32 *ifh, struct net_device *dev)
/* Fill up the buffer */ /* Fill up the buffer */
next_dcb_buf = &tx->dcbs_buf[next_to_use]; next_dcb_buf = &tx->dcbs_buf[next_to_use];
next_dcb_buf->skb = skb; next_dcb_buf->skb = skb;
next_dcb_buf->len = skb->len;
next_dcb_buf->dma_addr = dma_addr; next_dcb_buf->dma_addr = dma_addr;
next_dcb_buf->used = true; next_dcb_buf->used = true;
next_dcb_buf->ptp = false; next_dcb_buf->ptp = false;
......
...@@ -173,11 +173,12 @@ struct lan966x_rx { ...@@ -173,11 +173,12 @@ struct lan966x_rx {
}; };
struct lan966x_tx_dcb_buf { struct lan966x_tx_dcb_buf {
dma_addr_t dma_addr;
struct net_device *dev; struct net_device *dev;
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t dma_addr; u32 len;
bool used; u32 used : 1;
bool ptp; u32 ptp : 1;
}; };
struct lan966x_tx { struct lan966x_tx {
......
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