Skip to contentSkip to conversation

myri10ge: Use skb_fill_page_desc().

PATCH RESEND Superseded Andrew Gallatin 1 participant 1 message Nov 28, 2012

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 3/3 myri10ge: Use skb_fill_page_desc().

Now that LRO is gone, the receive routine is much simpler, and we are able to use the standard skb_fill_page_desc() in myri10ge.

---
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +4 -7
index 93ed089..6bf1d26 100644
@@ -1340,17 +1340,14 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum)
 	/* Fill skb_frag_struct(s) with data from our receive */
 	for (i = 0, remainder = len; remainder > 0; i++) {
 		myri10ge_unmap_rx_page(pdev, &rx->info[idx], bytes);
-		__skb_frag_set_page(&rx_frags[i], rx->info[idx].page);
-		rx_frags[i].page_offset = rx->info[idx].page_offset;
-		if (remainder < MYRI10GE_ALLOC_SIZE)
-			skb_frag_size_set(&rx_frags[i], remainder);
-		else
-			skb_frag_size_set(&rx_frags[i], MYRI10GE_ALLOC_SIZE);
+		skb_fill_page_desc(skb, i, rx->info[idx].page,
+				   rx->info[idx].page_offset,
+				   remainder < MYRI10GE_ALLOC_SIZE ?
+				   remainder : MYRI10GE_ALLOC_SIZE);
 		rx->cnt++;
 		idx = rx->cnt & rx->mask;
 		remainder -= MYRI10GE_ALLOC_SIZE;
 	}
-	skb_shinfo(skb)->nr_frags = i;
 
 	/* remove padding */
 	rx_frags[0].page_offset += MXGEFW_PAD;
Signature · 1 line
1.7.9.5