From: Jim Mott <jim@mellanox.com>
Date: Mon, 16 Jul 2007 12:27:12 +0000 (-0700)
Subject: Fix SDP build issue in 2.6.22-rc7 kernel. There are skbuff.h changes.
X-Git-Tag: v4.1.12-92~264^2~5^2~346
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=086c073f170db087e838ced95729f7d35bc5fb40;p=users%2Fjedix%2Flinux-maple.git

Fix SDP build issue in 2.6.22-rc7 kernel. There are skbuff.h changes.
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index ac06b42a33fc5..d33525df746fe 100644
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -524,7 +524,7 @@ static void sdp_handle_wc(struct sdp_sock *ssk, struct ib_wc *wc)
 			skb->data = skb->head;
 			skb->tail = skb->head + skb_headlen(skb);
 			h = (struct sdp_bsdh *)skb->data;
-			skb->h.raw = skb->data;
+			skb_reset_transport_header(skb);
 			ssk->mseq_ack = ntohl(h->mseq);
 			if (ssk->mseq_ack != (int)wc->wr_id)
 				printk("SDP BUG! mseq %d != wrid %d\n",
diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index ee6721dc22cda..1570c8155c59f 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -691,7 +691,7 @@ static int sdp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 			/* Subtract 1, if FIN is in queue. */
 			if (answ && !skb_queue_empty(&sk->sk_receive_queue))
 				answ -=
-		        ((struct sk_buff *)sk->sk_receive_queue.prev)->h.raw[0]
+			(skb_transport_header(sk->sk_receive_queue.prev))[0]
 		        == SDP_MID_DISCONN ? 1 : 0;
 		} else
 			answ = ssk->urg_seq - ssk->copied_seq;
@@ -1341,7 +1341,7 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 			if (!skb)
 				break;
 
-			if (skb->h.raw[0] == SDP_MID_DISCONN)
+			if ((skb_transport_header(skb))[0] == SDP_MID_DISCONN)
 				goto found_fin_ok;
 
 			if (before(*seq, TCP_SKB_CB(skb)->seq)) {