From e9602b27cf9a96959265520feac05e283a2cca49 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:25 +0000 Subject: [PATCH] --- yaml --- r: 266153 b: refs/heads/master c: 2098401c4ca6910f739df697694fad845615b6da h: refs/heads/master i: 266151: de0de6ec75b18c5b5506149b516a8c7f8534dd48 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/3com/typhoon.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc60e9583def..174ca6167058 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea968771d4c86ba42f84c7f472d9abe4c60c77f5 +refs/heads/master: 2098401c4ca6910f739df697694fad845615b6da diff --git a/trunk/drivers/net/ethernet/3com/typhoon.c b/trunk/drivers/net/ethernet/3com/typhoon.c index f1dc9acf6105..607c09e3dc80 100644 --- a/trunk/drivers/net/ethernet/3com/typhoon.c +++ b/trunk/drivers/net/ethernet/3com/typhoon.c @@ -819,8 +819,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) typhoon_inc_tx_index(&txRing->lastWrite, 1); len = frag->size; - frag_addr = (void *) page_address(frag->page) + - frag->page_offset; + frag_addr = skb_frag_address(frag); skb_dma = pci_map_single(tp->tx_pdev, frag_addr, len, PCI_DMA_TODEVICE); txd->flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;