Patchwork staging: octeon-ethernet: Fix compile error caused by changed to struct skb_frag_struct.

login
register
mail settings
Submitter David Daney
Date Nov. 7, 2011, 8:49 p.m.
Message ID <1320698970-1854-1-git-send-email-david.daney@cavium.com>
Download mbox | patch
Permalink /patch/124179/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

David Daney - Nov. 7, 2011, 8:49 p.m.
Evidently the definition of struct skb_frag_struct has changed, so we
need to change to match it.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 drivers/staging/octeon/ethernet-tx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Ralf Baechle - Nov. 9, 2011, 5:17 p.m.
On Mon, Nov 07, 2011 at 12:49:30PM -0800, David Daney wrote:

> Evidently the definition of struct skb_frag_struct has changed, so we
> need to change to match it.
> 
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---

As usual for this drive I've applied this to the MIPS tree and will
send it to Linus in a few days unless somebody objects.

Thanks,

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index b445cd6..2542c37 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/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;
 		}