[PATCH net-next 2/5] net, scsi/csgb4i: convert skb->transport_header into skb_transport_header(skb)

[PATCH net-next 2/5] net, scsi/csgb4i: convert skb->transport_header into skb_transport_header(skb)

[Isaku Yamahata]

The change set of 1a37e412, "net: Use 16bits for *_headers fields
of struct skbuff" converted from sk_buff_data_t into 16bit integer.
So skb->tail needs to be converted to skb_tail_pointer(skb).

Found by inspection. Compile tested only.

Cc: Simon Horman <horms@verge.net.au>
Cc: Li RongQing <roy.qing.li@gmail.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 3fecf35..9138d4e 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -358,7 +358,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)
 		return DIV_ROUND_UP(skb->len, 8);
 	flits = skb_transport_offset(skb) / 8;
 	cnt = skb_shinfo(skb)->nr_frags;
-	if (skb->tail != skb->transport_header)
+	if (skb_tail_pointer(skb) != skb_transport_header(skb))
 		cnt++;
 	return flits + sgl_len(cnt);
 }
-- 
1.7.10.4

Re: [PATCH net-next 2/5] net, scsi/csgb4i: convert skb->transport_header into skb_transport_header(skb)

[Simon Horman]

On Fri, Jun 14, 2013 at 05:58:32PM +0900, Isaku Yamahata wrote:
> The change set of 1a37e412, "net: Use 16bits for *_headers fields
> of struct skbuff" converted from sk_buff_data_t into 16bit integer.
> So skb->tail needs to be converted to skb_tail_pointer(skb).
> 
> Found by inspection. Compile tested only.
> 
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Li RongQing <roy.qing.li@gmail.com>
> Cc: linux-scsi@vger.kernel.org
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Acked-by: Simon Horman <horms@verge.net.au>

> ---
>  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
> index 3fecf35..9138d4e 100644
> --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
> +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
> @@ -358,7 +358,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)
>  		return DIV_ROUND_UP(skb->len, 8);
>  	flits = skb_transport_offset(skb) / 8;
>  	cnt = skb_shinfo(skb)->nr_frags;
> -	if (skb->tail != skb->transport_header)
> +	if (skb_tail_pointer(skb) != skb_transport_header(skb))
>  		cnt++;
>  	return flits + sgl_len(cnt);
>  }
> -- 
> 1.7.10.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH net-next 2/5] net, scsi/csgb4i: convert skb->transport_header into skb_transport_header(skb)

[David Miller]

From: Simon Horman <horms@verge.net.au>
Date: Mon, 17 Jun 2013 11:04:11 +0900

> On Fri, Jun 14, 2013 at 05:58:32PM +0900, Isaku Yamahata wrote:
>> The change set of 1a37e412, "net: Use 16bits for *_headers fields
>> of struct skbuff" converted from sk_buff_data_t into 16bit integer.
>> So skb->tail needs to be converted to skb_tail_pointer(skb).
>> 
>> Found by inspection. Compile tested only.
>> 
>> Cc: Simon Horman <horms@verge.net.au>
>> Cc: Li RongQing <roy.qing.li@gmail.com>
>> Cc: linux-scsi@vger.kernel.org
>> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> 
> Acked-by: Simon Horman <horms@verge.net.au>

Applied.