| Message ID | 20111102163708.75d719e765dea20e0c4c5a04@canb.auug.org.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 2 Nov 2011 16:37:08 +1100 > Subject: [PATCH] net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c > > Commit 9e903e085262 ("net: add skb frag size accessors") used frag_size > instead of skb_frag_size in this file. > > Fixes this build error: > > drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit': > drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration] > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied, thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 4d1658e..caf3659 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -716,8 +716,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; cur_p->phys = dma_map_single(ndev->dev.parent, skb_frag_address(frag), - frag_size(frag), DMA_TO_DEVICE); - cur_p->len = frag_size(frag); + skb_frag_size(frag), DMA_TO_DEVICE); + cur_p->len = skb_frag_size(frag); cur_p->app0 = 0; frag++; }
Hi all, [I thought I had reported this, but it was a similar problem in another driver.] After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit': drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration] Caused by commit 9e903e085262 ("net: add skb frag size accessors"). I have added this patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 2 Nov 2011 16:31:37 +1100 Subject: [PATCH] net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c Commit 9e903e085262 ("net: add skb frag size accessors") used frag_size instead of skb_frag_size in this file. Fixes this build error: drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit': drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration] Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)