Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-block.git] / drivers / net / thunderbolt.c

diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
index fcf31335a8b62f6c3dcf31b1270b0b8d1c6cdeb7..dacb4f680fd48b41d4dc430d95744edde794d240 100644 (file)
--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
@@ -1005,7 +1005,7 @@ static void *tbnet_kmap_frag(struct sk_buff *skb, unsigned int frag_num,
        const skb_frag_t *frag = &skb_shinfo(skb)->frags[frag_num];
 
        *len = skb_frag_size(frag);
-       return kmap_atomic(skb_frag_page(frag)) + frag->page_offset;
+       return kmap_atomic(skb_frag_page(frag)) + skb_frag_off(frag);
 }
 
 static netdev_tx_t tbnet_start_xmit(struct sk_buff *skb,