Patchwork linux-next: build failure after merge of the net-next tree

login
register
mail settings
Submitter Eric Dumazet
Date Oct. 25, 2011, 2:16 p.m.
Message ID <1319552170.10883.19.camel@edumazet-laptop>
Download mbox | patch
Permalink /patch/121699/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Oct. 25, 2011, 2:16 p.m.
Le mercredi 26 octobre 2011 à 00:55 +1100, Stephen Rothwell a écrit :
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> pseries_defconfig) failed like this:
> 
> drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'write_swqe2_data':
> drivers/net/ethernet/ibm/ehea/ehea_main.c:1692: error: implicit declaration of function 'frag_size'
> 
> Presumably caused by commit 9e903e085262 ("net: add skb frag size
> accessors").  I guess it should have been "skb_frag_size()".

My bad, sorry

[PATCH] ehea: fix skb_frag_size typo

commit 9e903e085262 (net: add skb frag size accessors) introduced a typo
in ehea driver.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 drivers/net/ethernet/ibm/ehea/ehea_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



--
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

Patch

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 0d4d4f6..37b70f7 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1689,7 +1689,7 @@  static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
 			sgentry = &sg_list[i - sg1entry_contains_frag_data];
 
 			sgentry->l_key = lkey;
-			sgentry->len = frag_size(frag);
+			sgentry->len = skb_frag_size(frag);
 			sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
 			swqe->descriptors++;
 		}