From: David Daney Date: Mon, 7 Nov 2011 20:49:30 +0000 (-0800) Subject: STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d804d4fdf90b3af62a41a20bf8b21b75529a003;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change Evidently the definition of struct skb_frag_struct has changed, so we need to change to match it. Signed-off-by: David Daney To: netdev@vger.kernel.org To: gregkh@suse.de To: devel@driverdev.osuosl.org Patchwork: https://patchwork.linux-mips.org/patch/2909/ Signed-off-by: Ralf Baechle --- diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index b445cd63f901..2542c3743904 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; }