tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

niu: Use page->private instead of page->index

We are close to removing page->index. Use page->private instead, which
is least likely to be removed.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://patch.msgid.link/20241216155124.3114-1-willy@infradead.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Matthew Wilcox (Oracle) and committed by
Jakub Kicinski 33d06d1d 1ba06ca9

+11 -11
+11 -11
drivers/net/ethernet/sun/niu.c
··· 3303 3303 addr &= PAGE_MASK; 3304 3304 pp = &rp->rxhash[h]; 3305 3305 for (; (p = *pp) != NULL; pp = &niu_next_page(p)) { 3306 - if (p->index == addr) { 3306 + if (p->private == addr) { 3307 3307 *link = pp; 3308 3308 goto found; 3309 3309 } ··· 3318 3318 { 3319 3319 unsigned int h = niu_hash_rxaddr(rp, base); 3320 3320 3321 - page->index = base; 3321 + page->private = base; 3322 3322 niu_next_page(page) = rp->rxhash[h]; 3323 3323 rp->rxhash[h] = page; 3324 3324 } ··· 3400 3400 3401 3401 rcr_size = rp->rbr_sizes[(val & RCR_ENTRY_PKTBUFSZ) >> 3402 3402 RCR_ENTRY_PKTBUFSZ_SHIFT]; 3403 - if ((page->index + PAGE_SIZE) - rcr_size == addr) { 3403 + if ((page->private + PAGE_SIZE) - rcr_size == addr) { 3404 3404 *link = niu_next_page(page); 3405 - np->ops->unmap_page(np->device, page->index, 3405 + np->ops->unmap_page(np->device, page->private, 3406 3406 PAGE_SIZE, DMA_FROM_DEVICE); 3407 - page->index = 0; 3407 + page->private = 0; 3408 3408 niu_next_page(page) = NULL; 3409 3409 __free_page(page); 3410 3410 rp->rbr_refill_pending++; ··· 3469 3469 append_size = append_size - skb->len; 3470 3470 3471 3471 niu_rx_skb_append(skb, page, off, append_size, rcr_size); 3472 - if ((page->index + rp->rbr_block_size) - rcr_size == addr) { 3472 + if ((page->private + rp->rbr_block_size) - rcr_size == addr) { 3473 3473 *link = niu_next_page(page); 3474 - np->ops->unmap_page(np->device, page->index, 3474 + np->ops->unmap_page(np->device, page->private, 3475 3475 PAGE_SIZE, DMA_FROM_DEVICE); 3476 - page->index = 0; 3476 + page->private = 0; 3477 3477 niu_next_page(page) = NULL; 3478 3478 rp->rbr_refill_pending++; 3479 3479 } else ··· 3538 3538 page = rp->rxhash[i]; 3539 3539 while (page) { 3540 3540 struct page *next = niu_next_page(page); 3541 - u64 base = page->index; 3541 + u64 base = page->private; 3542 3542 3543 3543 np->ops->unmap_page(np->device, base, PAGE_SIZE, 3544 3544 DMA_FROM_DEVICE); 3545 - page->index = 0; 3545 + page->private = 0; 3546 3546 niu_next_page(page) = NULL; 3547 3547 3548 3548 __free_page(page); ··· 6460 6460 page = rp->rxhash[j]; 6461 6461 while (page) { 6462 6462 struct page *next = niu_next_page(page); 6463 - u64 base = page->index; 6463 + u64 base = page->private; 6464 6464 base = base >> RBR_DESCR_ADDR_SHIFT; 6465 6465 rp->rbr[k++] = cpu_to_le32(base); 6466 6466 page = next;