diff for duplicates of <54653948.5070606@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index c79ba22..a92f19f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,7 +73,7 @@ dma_map_single() returns a DMA address, no? > free_num++; > } > @@ -1466,11 +1471,19 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) -> if (skb = NULL) +> if (skb == NULL) > break; /* Better luck next round. */ > sh_eth_set_receive_align(skb); > + dma_unmap_single(&ndev->dev, rxdesc->addr, @@ -94,7 +94,8 @@ dma_map_single() returns a DMA address, no? > + } > } > if (entry >= mdp->num_rx_ring - 1) -> rxdesc->status |> @@ -2104,12 +2117,18 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) +> rxdesc->status |= +> @@ -2104,12 +2117,18 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) > if (!mdp->cd->hw_swap) > sh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)), > skb->len + 2); diff --git a/a/content_digest b/N1/content_digest index 4e6e057..a305813 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01415862301-28032-4-git-send-email-ykaneko0929@gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 3/3] sh_eth: Fix dma mapping issue\0" - "Date\0Thu, 13 Nov 2014 23:05:44 +0000\0" + "Date\0Fri, 14 Nov 2014 02:05:44 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>" " netdev@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" @@ -86,7 +86,7 @@ "> \t\t\tfree_num++;\n" "> \t\t}\n" "> @@ -1466,11 +1471,19 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)\n" - "> \t\t\tif (skb = NULL)\n" + "> \t\t\tif (skb == NULL)\n" "> \t\t\t\tbreak;\t/* Better luck next round. */\n" "> \t\t\tsh_eth_set_receive_align(skb);\n" "> +\t\t\tdma_unmap_single(&ndev->dev, rxdesc->addr,\n" @@ -107,7 +107,8 @@ "> +\t\t\t}\n" "> \t\t}\n" "> \t\tif (entry >= mdp->num_rx_ring - 1)\n" - "> \t\t\trxdesc->status |> @@ -2104,12 +2117,18 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)\n" + "> \t\t\trxdesc->status |=\n" + "> @@ -2104,12 +2117,18 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)\n" "> \tif (!mdp->cd->hw_swap)\n" "> \t\tsh_eth_soft_swap(phys_to_virt(ALIGN(txdesc->addr, 4)),\n" "> \t\t\t\t skb->len + 2);\n" @@ -131,4 +132,4 @@ "\n" WBR, Sergei -9c89e69f0b2c7eecc69d14bb2da269c8fc119fe65db8181ebbeb0eb7606d7a0e +22706529f52fe962358725d5d00ad62ae5203a0a6ecfe8f6785464604c9cfa3b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.