From 9944b4dc2506aa6f0260d5e17989c5d6228622b9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:24 +0000 Subject: [PATCH] --- yaml --- r: 266152 b: refs/heads/master c: ea968771d4c86ba42f84c7f472d9abe4c60c77f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/tundra/tsi108_eth.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b372f3a8240a..bc60e9583def 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4811086b733cd9988fb17ad471357bdd5a37a01 +refs/heads/master: ea968771d4c86ba42f84c7f472d9abe4c60c77f5 diff --git a/trunk/drivers/net/ethernet/tundra/tsi108_eth.c b/trunk/drivers/net/ethernet/tundra/tsi108_eth.c index 480a4ba53172..a03996cf88ed 100644 --- a/trunk/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/trunk/drivers/net/ethernet/tundra/tsi108_eth.c @@ -711,9 +711,10 @@ static int tsi108_send_packet(struct sk_buff * skb, struct net_device *dev) } else { skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1]; - data->txring[tx].buf0 = - dma_map_page(NULL, frag->page, frag->page_offset, - frag->size, DMA_TO_DEVICE); + data->txring[tx].buf0 = skb_frag_dma_map(NULL, frag, + 0, + frag->size, + DMA_TO_DEVICE); data->txring[tx].len = frag->size; }