[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <be093b6dd643918406479b11667992ce5aacdd9f.1310339688.git.mirq-linux@rere.qmqm.pl>
Date: Mon, 11 Jul 2011 02:52:49 +0200 (CEST)
From: Michał Mirosław <mirq-linux@...e.qmqm.pl>
To: netdev@...r.kernel.org
Subject: [PATCH v2 09/46] net: octeon_mgmt: fix DMA unmap size
Also: use netdev_alloc_skb_ip_align() for readability.
Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
---
drivers/net/octeon/octeon_mgmt.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 429e08c..dd4a57a 100644
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -152,16 +152,15 @@ static void octeon_mgmt_rx_fill_ring(struct net_device *netdev)
struct sk_buff *skb;
/* CN56XX pass 1 needs 8 bytes of padding. */
- size = netdev->mtu + OCTEON_MGMT_RX_HEADROOM + 8 + NET_IP_ALIGN;
+ size = netdev->mtu + OCTEON_MGMT_RX_HEADROOM + 8;
- skb = netdev_alloc_skb(netdev, size);
+ skb = netdev_alloc_skb_ip_align(netdev, size);
if (!skb)
break;
- skb_reserve(skb, NET_IP_ALIGN);
__skb_queue_tail(&p->rx_list, skb);
re.d64 = 0;
- re.s.len = size;
+ re.s.len = size = skb_tailroom(skb);
re.s.addr = dma_map_single(p->dev, skb->data,
size,
DMA_FROM_DEVICE);
@@ -297,7 +296,7 @@ static u64 octeon_mgmt_dequeue_rx_buffer(struct octeon_mgmt *p,
*pskb = __skb_dequeue(&p->rx_list);
dma_unmap_single(p->dev, re.s.addr,
- ETH_FRAME_LEN + OCTEON_MGMT_RX_HEADROOM,
+ skb_tailroom(*pskb),
DMA_FROM_DEVICE);
return re.d64;
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists