From 48e6e2887025dc1357ca90dc1c0d024e06883ed5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Aug 2011 00:46:54 +0000 Subject: [PATCH] --- yaml --- r: 265709 b: refs/heads/master c: f327358ab2cdfa534b2dc89e9dd2266c0f61f587 h: refs/heads/master i: 265707: 5201e3c33426d0171572d26e7d550cb4c5548328 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/jme.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d912b2ffb89f..b6d0925106a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8838a5381149ff69e23dc13de7c81b28ac688e2e +refs/heads/master: f327358ab2cdfa534b2dc89e9dd2266c0f61f587 diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c index a869ee47dde6..48a0a23f342f 100644 --- a/trunk/drivers/net/ethernet/jme.c +++ b/trunk/drivers/net/ethernet/jme.c @@ -1928,8 +1928,9 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) ctxdesc = txdesc + ((idx + i + 2) & (mask)); ctxbi = txbi + ((idx + i + 2) & (mask)); - jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, frag->page, - frag->page_offset, frag->size, hidma); + jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, + skb_frag_page(frag), + frag->page_offset, frag->size, hidma); } len = skb_is_nonlinear(skb) ? skb_headlen(skb) : skb->len;