From 5d43a30f139de4c3884bc56400854bcfa1b77e6a Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 7 Nov 2011 12:49:30 -0800 Subject: [PATCH] --- yaml --- r: 275493 b: refs/heads/master c: 8d804d4fdf90b3af62a41a20bf8b21b75529a003 h: refs/heads/master i: 275491: c04545ed63e187274fae813f3febe34ab8e6be72 v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet-tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3322f79bcaf0..ae23d5c8a12f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ff8584e51d4d3fbe08ede413c4a221223766323 +refs/heads/master: 8d804d4fdf90b3af62a41a20bf8b21b75529a003 diff --git a/trunk/drivers/staging/octeon/ethernet-tx.c b/trunk/drivers/staging/octeon/ethernet-tx.c index b445cd63f901..2542c3743904 100644 --- a/trunk/drivers/staging/octeon/ethernet-tx.c +++ b/trunk/drivers/staging/octeon/ethernet-tx.c @@ -275,7 +275,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) CVM_OCT_SKB_CB(skb)[0] = hw_buffer.u64; for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { struct skb_frag_struct *fs = skb_shinfo(skb)->frags + i; - hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page) + fs->page_offset)); + hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page.p) + fs->page_offset)); hw_buffer.s.size = fs->size; CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64; }