diff for duplicates of <54653547.9050207@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 0a4c306..b9d8a9b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -68,7 +68,7 @@ debug code... > - skb = netdev_alloc_skb(ndev, mdp->rx_buf_sz); > + skb = netdev_alloc_skb(ndev, skbuff_size); > mdp->rx_skbuff[i] = skb; -> if (skb = NULL) +> if (skb == NULL) > break; > - dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz, > - DMA_FROM_DEVICE); @@ -109,11 +109,11 @@ fix it then. :-) > @@ -1468,13 +1461,13 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) > rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16); > -> if (mdp->rx_skbuff[entry] = NULL) { +> if (mdp->rx_skbuff[entry] == NULL) { > - skb = netdev_alloc_skb(ndev, mdp->rx_buf_sz); > + skb = netdev_alloc_skb(ndev, skbuff_size); > mdp->rx_skbuff[entry] = skb; -> if (skb = NULL) +> if (skb == NULL) > break; /* Better luck next round. */ > - dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz, > - DMA_FROM_DEVICE); diff --git a/a/content_digest b/N1/content_digest index b0eda88..174d003 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01415862301-28032-3-git-send-email-ykaneko0929@gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 2/3] sh_eth: Fix skb alloc size and alignment adjust rule.\0" - "Date\0Thu, 13 Nov 2014 22:48:39 +0000\0" + "Date\0Fri, 14 Nov 2014 01:48:39 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>" " netdev@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" @@ -81,7 +81,7 @@ "> -\t\tskb = netdev_alloc_skb(ndev, mdp->rx_buf_sz);\n" "> +\t\tskb = netdev_alloc_skb(ndev, skbuff_size);\n" "> \t\tmdp->rx_skbuff[i] = skb;\n" - "> \t\tif (skb = NULL)\n" + "> \t\tif (skb == NULL)\n" "> \t\t\tbreak;\n" "> -\t\tdma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,\n" "> -\t\t\t DMA_FROM_DEVICE);\n" @@ -122,11 +122,11 @@ "> @@ -1468,13 +1461,13 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)\n" "> \t\trxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);\n" ">\n" - "> \t\tif (mdp->rx_skbuff[entry] = NULL) {\n" + "> \t\tif (mdp->rx_skbuff[entry] == NULL) {\n" "> -\t\t\tskb = netdev_alloc_skb(ndev, mdp->rx_buf_sz);\n" "> +\t\t\tskb = netdev_alloc_skb(ndev, skbuff_size);\n" "> \t\t\tmdp->rx_skbuff[entry] = skb;\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\tdma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,\n" "> -\t\t\t\t DMA_FROM_DEVICE);\n" @@ -159,4 +159,4 @@ "\n" WBR, Sergei -9ac4d63a332f5b2edb5fc44962c089754a04aad4d75435f2a140b32a02bfa368 +dd6b198eb508dfade25d7affa033ca39904e6a5515141226cfd21298e48b6591
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.