aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/sge.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3/sge.c')
-rw-r--r--drivers/net/cxgb3/sge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 610e4769efa4..c5faf1380e15 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1325,13 +1325,13 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb,
1325 flits = skb_transport_offset(skb) / 8; 1325 flits = skb_transport_offset(skb) / 8;
1326 sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl; 1326 sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl;
1327 sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb), 1327 sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb),
1328 skb->tail - skb_transport_header(skb), 1328 skb->tail - skb->transport_header,
1329 adap->pdev); 1329 adap->pdev);
1330 if (need_skb_unmap()) { 1330 if (need_skb_unmap()) {
1331 setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits); 1331 setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits);
1332 skb->destructor = deferred_unmap_destructor; 1332 skb->destructor = deferred_unmap_destructor;
1333 ((struct unmap_info *)skb->cb)->len = (skb->tail - 1333 ((struct unmap_info *)skb->cb)->len = (skb->tail -
1334 skb_transport_header(skb)); 1334 skb->transport_header);
1335 } 1335 }
1336 1336
1337 write_wr_hdr_sgl(ndesc, skb, d, pidx, q, sgl, flits, sgl_flits, 1337 write_wr_hdr_sgl(ndesc, skb, d, pidx, q, sgl, flits, sgl_flits,
@@ -1353,7 +1353,7 @@ static inline unsigned int calc_tx_descs_ofld(const struct sk_buff *skb)
1353 return 1; /* packet fits as immediate data */ 1353 return 1; /* packet fits as immediate data */
1354 1354
1355 flits = skb_transport_offset(skb) / 8; /* headers */ 1355 flits = skb_transport_offset(skb) / 8; /* headers */
1356 if (skb->tail != skb_transport_header(skb)) 1356 if (skb->tail != skb->transport_header)
1357 cnt++; 1357 cnt++;
1358 return flits_to_desc(flits + sgl_len(cnt)); 1358 return flits_to_desc(flits + sgl_len(cnt));
1359} 1359}