Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8d804d4fdf90b3af62a41a20bf8b21b75529a003

Authored by David Daney
Committed by Ralf Baechle
1 parent 8ff8584e51
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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 <david.daney@cavium.com>
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 <ralf@linux-mips.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/staging/octeon/ethernet-tx.c
Diff comments   View file @ 8d804d4
... ... @@ -275,7 +275,7 @@
275 275 CVM_OCT_SKB_CB(skb)[0] = hw_buffer.u64;
276 276 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
277 277 struct skb_frag_struct *fs = skb_shinfo(skb)->frags + i;
278   - hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page) + fs->page_offset));
  278 + hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page.p) + fs->page_offset));
279 279 hw_buffer.s.size = fs->size;
280 280 CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
281 281 }