From: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Thu, 27 Jul 2006 14:37:47 +0000 (+0300)
Subject: IB/sdp: Change PFN_INDEX -> PAGE_INDEX
X-Git-Tag: v4.1.12-92~264^2~5^2~396
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b1dd7e5196ca4a9f1a683ece39c59dcf36618f78;p=users%2Fjedix%2Flinux-maple.git

IB/sdp: Change PFN_INDEX -> PAGE_INDEX
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index ec35ec1b7c53f..f95ab03f537a1 100644
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -361,7 +361,7 @@ static void sdp_handle_wc(struct sdp_sock *ssk, struct ib_wc *wc)
 {
 	struct sk_buff *skb;
 	struct sdp_bsdh *h;
-	int i;
+	int pagesz, i;
 
 	if (wc->wr_id & SDP_OP_RECV) {
 		skb = sdp_recv_completion(ssk, wc->wr_id);
@@ -395,13 +395,13 @@ static void sdp_handle_wc(struct sdp_sock *ssk, struct ib_wc *wc)
 			ssk->bufs = ntohl(h->mseq_ack) - ssk->tx_head + 1 +
 				ntohs(h->bufs);
 
-			skb->truesize = sizeof(struct sdp_bsdh) +
-				PAGE_ALIGN(skb->data_len);
-			skb_shinfo(skb)->nr_frags = PFN_ALIGN(skb->data_len);
+			pagesz = PAGE_ALIGN(skb->data_len);
+			skb->truesize = sizeof(struct sdp_bsdh) + pagesz;
+			skb_shinfo(skb)->nr_frags = pagesz / PAGE_SIZE;
 
 			for (i = skb_shinfo(skb)->nr_frags;
 			     i < SDP_MAX_SEND_SKB_FRAGS; ++i)
-				__free_page(skb_shinfo(skb)->frags[i].page);
+				put_page(skb_shinfo(skb)->frags[i].page);
 
 			if (likely(h->mid == SDP_MID_DATA) &&
 			    likely(skb->data_len > 0)) {