Message ID | e9e0e51be02aec40989c4715466d0142381929fe.1371200138.git.yamahata@valinux.co.jp |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Jun 14, 2013 at 05:58:34PM +0900, Isaku Yamahata wrote: > The change set of 4305b541, "[SK_BUFF]: Convert skb->end to sk_buff_data_t" > converted skb->end from pointer type to sk_buff_data_t. > The pointed value should be accessed via skb_end_pointer(). > > Since arm arch doesn't define NET_SKBUFF_DATA_USES_OFFSET, > skb->end is effectively pointer. So it doesn't cause a real problem. > But this patch is good for consistency. > > Found by inspection. Compile tested only. > > Cc: Simon Horman <horms@verge.net.au> > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au> > --- > drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c > index 2602cf7..ec20508 100644 > --- a/drivers/net/ethernet/marvell/pxa168_eth.c > +++ b/drivers/net/ethernet/marvell/pxa168_eth.c > @@ -357,7 +357,7 @@ static void rxq_refill(struct net_device *dev) > /* Get 'used' Rx descriptor */ > used_rx_desc = pep->rx_used_desc_q; > p_used_rx_desc = &pep->p_rx_desc_area[used_rx_desc]; > - size = skb->end - skb->data; > + size = skb_end_pointer(skb) - skb->data; > p_used_rx_desc->buf_ptr = dma_map_single(NULL, > skb->data, > size, > -- > 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 > -- 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
From: Simon Horman <horms@verge.net.au> Date: Mon, 17 Jun 2013 11:01:50 +0900 > On Fri, Jun 14, 2013 at 05:58:34PM +0900, Isaku Yamahata wrote: >> The change set of 4305b541, "[SK_BUFF]: Convert skb->end to sk_buff_data_t" >> converted skb->end from pointer type to sk_buff_data_t. >> The pointed value should be accessed via skb_end_pointer(). >> >> Since arm arch doesn't define NET_SKBUFF_DATA_USES_OFFSET, >> skb->end is effectively pointer. So it doesn't cause a real problem. >> But this patch is good for consistency. >> >> Found by inspection. Compile tested only. >> >> Cc: Simon Horman <horms@verge.net.au> >> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > > Reviewed-by: Simon Horman <horms@verge.net.au> Applied. -- 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
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 2602cf7..ec20508 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -357,7 +357,7 @@ static void rxq_refill(struct net_device *dev) /* Get 'used' Rx descriptor */ used_rx_desc = pep->rx_used_desc_q; p_used_rx_desc = &pep->p_rx_desc_area[used_rx_desc]; - size = skb->end - skb->data; + size = skb_end_pointer(skb) - skb->data; p_used_rx_desc->buf_ptr = dma_map_single(NULL, skb->data, size,
The change set of 4305b541, "[SK_BUFF]: Convert skb->end to sk_buff_data_t" converted skb->end from pointer type to sk_buff_data_t. The pointed value should be accessed via skb_end_pointer(). Since arm arch doesn't define NET_SKBUFF_DATA_USES_OFFSET, skb->end is effectively pointer. So it doesn't cause a real problem. But this patch is good for consistency. Found by inspection. Compile tested only. Cc: Simon Horman <horms@verge.net.au> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)