* [PATCH] net: ll_temac: Fix DMA map size bug
@ 2015-05-12 5:58 Michal Simek
2015-05-12 6:03 ` Julia Lawall
0 siblings, 1 reply; 3+ messages in thread
From: Michal Simek @ 2015-05-12 5:58 UTC (permalink / raw)
To: netdev
Cc: Sören Brinkmann, monstr, Fabian Frederick, linux-kernel,
David S. Miller, Manuel Schölling, Julia Lawall,
Markus Elfring, Subbaraya Sundeep Bhatta, linux-arm-kernel
DMA allocates skb->len instead of headlen
which is used for DMA.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index ca640d04fd93..cfb6bdb37fdc 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -705,8 +705,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
cur_p->app0 |= STS_CTRL_APP0_SOP;
cur_p->len = skb_headlen(skb);
- cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
- DMA_TO_DEVICE);
+ cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
+ skb_headlen(skb), DMA_TO_DEVICE);
cur_p->app4 = (unsigned long)skb;
for (ii = 0; ii < num_frag; ii++) {
--
2.3.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ll_temac: Fix DMA map size bug
2015-05-12 5:58 [PATCH] net: ll_temac: Fix DMA map size bug Michal Simek
@ 2015-05-12 6:03 ` Julia Lawall
2015-05-12 6:06 ` Michal Simek
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2015-05-12 6:03 UTC (permalink / raw)
To: Michal Simek
Cc: netdev, Sören Brinkmann, monstr, Fabian Frederick,
linux-kernel, David S. Miller, Manuel Schölling,
Julia Lawall, Markus Elfring, Subbaraya Sundeep Bhatta,
linux-arm-kernel
On Tue, 12 May 2015, Michal Simek wrote:
> DMA allocates skb->len instead of headlen
> which is used for DMA.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
> index ca640d04fd93..cfb6bdb37fdc 100644
> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> @@ -705,8 +705,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>
> cur_p->app0 |= STS_CTRL_APP0_SOP;
> cur_p->len = skb_headlen(skb);
> - cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
> - DMA_TO_DEVICE);
> + cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
> + skb_headlen(skb), DMA_TO_DEVICE);
I think you could align the later arguments with the right side of the
parenthesis, as done in the original code.
julia
> cur_p->app4 = (unsigned long)skb;
>
> for (ii = 0; ii < num_frag; ii++) {
> --
> 2.3.5
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ll_temac: Fix DMA map size bug
2015-05-12 6:03 ` Julia Lawall
@ 2015-05-12 6:06 ` Michal Simek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Simek @ 2015-05-12 6:06 UTC (permalink / raw)
To: Julia Lawall, Michal Simek
Cc: netdev, Sören Brinkmann, monstr, Fabian Frederick,
linux-kernel, David S. Miller, Manuel Schölling,
Markus Elfring, Subbaraya Sundeep Bhatta, linux-arm-kernel
On 05/12/2015 08:03 AM, Julia Lawall wrote:
> On Tue, 12 May 2015, Michal Simek wrote:
>
>> DMA allocates skb->len instead of headlen
>> which is used for DMA.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>> drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
>> index ca640d04fd93..cfb6bdb37fdc 100644
>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
>> @@ -705,8 +705,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>>
>> cur_p->app0 |= STS_CTRL_APP0_SOP;
>> cur_p->len = skb_headlen(skb);
>> - cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
>> - DMA_TO_DEVICE);
>> + cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
>> + skb_headlen(skb), DMA_TO_DEVICE);
>
> I think you could align the later arguments with the right side of the
> parenthesis, as done in the original code.
Fixed and send v2.
Thanks,
Michal
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-12 6:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-12 5:58 [PATCH] net: ll_temac: Fix DMA map size bug Michal Simek
2015-05-12 6:03 ` Julia Lawall
2015-05-12 6:06 ` Michal Simek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).