cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header
Subsystems (4)
PATCH 1/1 cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header
From: Li RongQing <[email protected]>
This corrects an regression introduced by "net: Use 16bits for *_headers fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In that case skb->tail will be a pointer whereas skb->transport_header will be an offset from head. This is corrected by using wrappers that ensure that comparisons and calculations are always made using pointers.
--- drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb3/sge.c +1 -1
@@ -1583,7 +1583,7 @@ static void deferred_unmap_destructor(struct sk_buff *skb) dui = (struct deferred_unmap_info *)skb->head; p = dui->addr; -if (skb->tail - skb->transport_header) +if (skb_tail_pointer (skb) -skb_transport_header (skb))pci_unmap_single (dui->pdev, *p++,skb_tail_pointer (skb) -skb_transport_header (skb),PCI_DMA_TODEVICE );
drivers/net/ethernet/chelsio/cxgb4/sge.c +1 -1
@@ -1294,7 +1294,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb) flits =skb_transport_offset (skb) /8U ;/* headers */ 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); }
Signature · 1 line
1.7.10.4
Quoted 10 lines · On Tue, Jun 04, 2013 at 04:11:16PM +0800, [email protected] wrote:
From: Li RongQing <[email protected]>
This corrects an regression introduced by "net: Use 16bits for
*_headersfields of struct skbuff" whenNET_SKBUFF_DATA_USES_OFFSETis not set. In that caseskb->tailwill be a pointer whereasskb->transport_headerwill be an offset from head. This is corrected by using wrappers that ensure that comparisons and calculations are always made using pointers.Cc Simon Horman <[email protected]>Signed-off-by Li RongQing <[email protected]>
Quoted 39 lines
--- drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/chelsio/cxgb3/sge.c +1
-1@@ -1583,7 +1583,7 @@ static void deferred_unmap_destructor(struct sk_buff *skb) dui = (struct deferred_unmap_info *)skb->head; p = dui->addr; -if (skb->tail - skb->transport_header) +if (skb_tail_pointer (skb) -skb_transport_header (skb))pci_unmap_single (dui->pdev, *p++,skb_tail_pointer (skb) -skb_transport_header (skb),PCI_DMA_TODEVICE );drivers/net/ethernet/chelsio/cxgb4/sge.c +1
-1@@ -1294,7 +1294,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb) flits =skb_transport_offset (skb) /8U ;/* headers */ 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); }Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Simon Horman <[email protected]>
Date: Tue, 4 Jun 2013 22:23:53 +0900
Quoted 9 lines · On Tue, Jun 04, 2013 at 04:11:16PM +0800, [email protected] wrote:
Quoted 8 lines
From: Li RongQing <[email protected]>
This corrects an regression introduced by "net: Use 16bits for
*_headersfields of struct skbuff" whenNET_SKBUFF_DATA_USES_OFFSETis not set. In that caseskb->tailwill be a pointer whereasskb->transport_headerwill be an offset from head. This is corrected by using wrappers that ensure that comparisons and calculations are always made using pointers.
Quoted 4 lines
Quoted 2 lines
Cc Simon Horman <[email protected]>Signed-off-by Li RongQing <[email protected]>Reviewed-by Simon Horman <[email protected]>
Applied.