Skip to content

Commit bc8acf2

Browse files
Eric Dumazetdavem330
authored andcommitted
drivers/net: avoid some skb->ip_summed initializations
fresh skbs have ip_summed set to CHECKSUM_NONE (0) We can avoid setting again skb->ip_summed to CHECKSUM_NONE in drivers. Introduce skb_checksum_none_assert() helper so that we keep this assertion documented in driver sources. Change most occurrences of : skb->ip_summed = CHECKSUM_NONE; by : skb_checksum_none_assert(skb); Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7162f66 commit bc8acf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+86
-67
lines changed

drivers/net/8139cp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget)
561561
if (cp_rx_csum_ok(status))
562562
skb->ip_summed = CHECKSUM_UNNECESSARY;
563563
else
564-
skb->ip_summed = CHECKSUM_NONE;
564+
skb_checksum_none_assert(skb);
565565

566566
skb_put(skb, len);
567567

drivers/net/acenic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
20332033
skb->csum = htons(csum);
20342034
skb->ip_summed = CHECKSUM_COMPLETE;
20352035
} else {
2036-
skb->ip_summed = CHECKSUM_NONE;
2036+
skb_checksum_none_assert(skb);
20372037
}
20382038

20392039
/* send it up */

drivers/net/atl1c/atl1c_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter,
17191719
* cannot figure out if the packet is fragmented or not,
17201720
* so we tell the KERNEL CHECKSUM_NONE
17211721
*/
1722-
skb->ip_summed = CHECKSUM_NONE;
1722+
skb_checksum_none_assert(skb);
17231723
}
17241724

17251725
static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid)

drivers/net/atl1e/atl1e_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ static inline void atl1e_rx_checksum(struct atl1e_adapter *adapter,
13311331
u16 pkt_flags;
13321332
u16 err_flags;
13331333

1334-
skb->ip_summed = CHECKSUM_NONE;
1334+
skb_checksum_none_assert(skb);
13351335
pkt_flags = prrs->pkt_flag;
13361336
err_flags = prrs->err_flag;
13371337
if (((pkt_flags & RRS_IS_IPV4) || (pkt_flags & RRS_IS_IPV6)) &&

drivers/net/atlx/atl1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
18051805
* the higher layers and let it be sorted out there.
18061806
*/
18071807

1808-
skb->ip_summed = CHECKSUM_NONE;
1808+
skb_checksum_none_assert(skb);
18091809

18101810
if (unlikely(rrd->pkt_flg & PACKET_FLAG_ERR)) {
18111811
if (rrd->err_flg & (ERR_FLAG_CRC | ERR_FLAG_TRUNC |

drivers/net/b44.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ static int b44_rx(struct b44 *bp, int budget)
818818
copy_skb->data, len);
819819
skb = copy_skb;
820820
}
821-
skb->ip_summed = CHECKSUM_NONE;
821+
skb_checksum_none_assert(skb);
822822
skb->protocol = eth_type_trans(skb, bp->dev);
823823
netif_receive_skb(skb);
824824
received++;

drivers/net/benet/be_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
10161016
skb_fill_rx_data(adapter, skb, rxcp, num_rcvd);
10171017

10181018
if (do_pkt_csum(rxcp, adapter->rx_csum))
1019-
skb->ip_summed = CHECKSUM_NONE;
1019+
skb_checksum_none_assert(skb);
10201020
else
10211021
skb->ip_summed = CHECKSUM_UNNECESSARY;
10221022

drivers/net/bna/bnad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
510510
(flags & BNA_CQ_EF_L4_CKSUM_OK)))
511511
skb->ip_summed = CHECKSUM_UNNECESSARY;
512512
else
513-
skb->ip_summed = CHECKSUM_NONE;
513+
skb_checksum_none_assert(skb);
514514

515515
rcb->rxq->rx_packets++;
516516
rcb->rxq->rx_bytes += skb->len;

drivers/net/bnx2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3218,7 +3218,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
32183218

32193219
}
32203220

3221-
skb->ip_summed = CHECKSUM_NONE;
3221+
skb_checksum_none_assert(skb);
32223222
if (bp->rx_csum &&
32233223
(status & (L2_FHDR_STATUS_TCP_SEGMENT |
32243224
L2_FHDR_STATUS_UDP_DATAGRAM))) {

drivers/net/bnx2x/bnx2x_cmn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
623623
/* Set Toeplitz hash for a none-LRO skb */
624624
bnx2x_set_skb_rxhash(bp, cqe, skb);
625625

626-
skb->ip_summed = CHECKSUM_NONE;
626+
skb_checksum_none_assert(skb);
627627
if (bp->rx_csum) {
628628
if (likely(BNX2X_RX_CSUM_OK(cqe)))
629629
skb->ip_summed = CHECKSUM_UNNECESSARY;

drivers/net/cassini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,
21492149
skb->csum = csum_unfold(~csum);
21502150
skb->ip_summed = CHECKSUM_COMPLETE;
21512151
} else
2152-
skb->ip_summed = CHECKSUM_NONE;
2152+
skb_checksum_none_assert(skb);
21532153
return len;
21542154
}
21552155

drivers/net/chelsio/sge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
13881388
++st->rx_cso_good;
13891389
skb->ip_summed = CHECKSUM_UNNECESSARY;
13901390
} else
1391-
skb->ip_summed = CHECKSUM_NONE;
1391+
skb_checksum_none_assert(skb);
13921392

13931393
if (unlikely(adapter->vlan_grp && p->vlan_valid)) {
13941394
st->vlan_xtract++;

drivers/net/cpmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static struct sk_buff *cpmac_rx_one(struct cpmac_priv *priv,
391391
if (likely(skb)) {
392392
skb_put(desc->skb, desc->datalen);
393393
desc->skb->protocol = eth_type_trans(desc->skb, priv->dev);
394-
desc->skb->ip_summed = CHECKSUM_NONE;
394+
skb_checksum_none_assert(desc->skb);
395395
priv->dev->stats.rx_packets++;
396396
priv->dev->stats.rx_bytes += desc->datalen;
397397
result = desc->skb;

drivers/net/cxgb3/sge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2022,7 +2022,7 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
20222022
qs->port_stats[SGE_PSTAT_RX_CSUM_GOOD]++;
20232023
skb->ip_summed = CHECKSUM_UNNECESSARY;
20242024
} else
2025-
skb->ip_summed = CHECKSUM_NONE;
2025+
skb_checksum_none_assert(skb);
20262026
skb_record_rx_queue(skb, qs - &adap->sge.qs[0]);
20272027

20282028
if (unlikely(p->vlan_valid)) {

drivers/net/cxgb4/sge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
16051605
rxq->stats.rx_cso++;
16061606
}
16071607
} else
1608-
skb->ip_summed = CHECKSUM_NONE;
1608+
skb_checksum_none_assert(skb);
16091609

16101610
if (unlikely(pkt->vlan_ex)) {
16111611
struct vlan_group *grp = pi->vlan_grp;

drivers/net/cxgb4vf/sge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
15341534
}
15351535
rxq->stats.rx_cso++;
15361536
} else
1537-
skb->ip_summed = CHECKSUM_NONE;
1537+
skb_checksum_none_assert(skb);
15381538

15391539
if (unlikely(pkt->vlan_ex)) {
15401540
struct vlan_group *grp = pi->vlan_grp;

drivers/net/dm9000.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ dm9000_rx(struct net_device *dev)
10561056
if ((((rxbyte & 0x1c) << 3) & rxbyte) == 0)
10571057
skb->ip_summed = CHECKSUM_UNNECESSARY;
10581058
else
1059-
skb->ip_summed = CHECKSUM_NONE;
1059+
skb_checksum_none_assert(skb);
10601060
}
10611061
netif_rx(skb);
10621062
dev->stats.rx_packets++;

drivers/net/e1000/e1000_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3552,7 +3552,8 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
35523552
struct e1000_hw *hw = &adapter->hw;
35533553
u16 status = (u16)status_err;
35543554
u8 errors = (u8)(status_err >> 24);
3555-
skb->ip_summed = CHECKSUM_NONE;
3555+
3556+
skb_checksum_none_assert(skb);
35563557

35573558
/* 82543 or newer only */
35583559
if (unlikely(hw->mac_type < e1000_82543)) return;

drivers/net/e1000e/netdev.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,8 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
475475
{
476476
u16 status = (u16)status_err;
477477
u8 errors = (u8)(status_err >> 24);
478-
skb->ip_summed = CHECKSUM_NONE;
478+
479+
skb_checksum_none_assert(skb);
479480

480481
/* Ignore Checksum bit is set */
481482
if (status & E1000_RXD_STAT_IXSM)

drivers/net/gianfar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2654,7 +2654,7 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
26542654
if ((fcb->flags & RXFCB_CSUM_MASK) == (RXFCB_CIP | RXFCB_CTU))
26552655
skb->ip_summed = CHECKSUM_UNNECESSARY;
26562656
else
2657-
skb->ip_summed = CHECKSUM_NONE;
2657+
skb_checksum_none_assert(skb);
26582658
}
26592659

26602660

drivers/net/greth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
893893
if (greth->flags & GRETH_FLAG_RX_CSUM && hw_checksummed(status))
894894
skb->ip_summed = CHECKSUM_UNNECESSARY;
895895
else
896-
skb->ip_summed = CHECKSUM_NONE;
896+
skb_checksum_none_assert(skb);
897897

898898
skb->protocol = eth_type_trans(skb, dev);
899899
dev->stats.rx_packets++;

drivers/net/ibmlana.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ static void irqrx_handler(struct net_device *dev)
602602
/* set up skb fields */
603603

604604
skb->protocol = eth_type_trans(skb, dev);
605-
skb->ip_summed = CHECKSUM_NONE;
605+
skb_checksum_none_assert(skb);
606606

607607
/* bookkeeping */
608608
dev->stats.rx_packets++;

drivers/net/igb/igb_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5455,7 +5455,7 @@ static void igb_receive_skb(struct igb_q_vector *q_vector,
54555455
static inline void igb_rx_checksum_adv(struct igb_ring *ring,
54565456
u32 status_err, struct sk_buff *skb)
54575457
{
5458-
skb->ip_summed = CHECKSUM_NONE;
5458+
skb_checksum_none_assert(skb);
54595459

54605460
/* Ignore Checksum bit is set or checksum is disabled through ethtool */
54615461
if (!(ring->flags & IGB_RING_FLAG_RX_CSUM) ||

drivers/net/igbvf/netdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
103103
static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
104104
u32 status_err, struct sk_buff *skb)
105105
{
106-
skb->ip_summed = CHECKSUM_NONE;
106+
skb_checksum_none_assert(skb);
107107

108108
/* Ignore Checksum bit is set or checksum is disabled through ethtool */
109109
if ((status_err & E1000_RXD_STAT_IXSM) ||

drivers/net/ipg.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ static void ipg_nic_rx_with_start_and_end(struct net_device *dev,
12131213

12141214
skb_put(skb, framelen);
12151215
skb->protocol = eth_type_trans(skb, dev);
1216-
skb->ip_summed = CHECKSUM_NONE;
1216+
skb_checksum_none_assert(skb);
12171217
netif_rx(skb);
12181218
sp->rx_buff[entry] = NULL;
12191219
}
@@ -1278,7 +1278,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev,
12781278
jumbo->skb->protocol =
12791279
eth_type_trans(jumbo->skb, dev);
12801280

1281-
jumbo->skb->ip_summed = CHECKSUM_NONE;
1281+
skb_checksum_none_assert(jumbo->skb);
12821282
netif_rx(jumbo->skb);
12831283
}
12841284
}
@@ -1476,7 +1476,7 @@ static int ipg_nic_rx(struct net_device *dev)
14761476
* IP/TCP/UDP frame was received. Let the
14771477
* upper layer decide.
14781478
*/
1479-
skb->ip_summed = CHECKSUM_NONE;
1479+
skb_checksum_none_assert(skb);
14801480

14811481
/* Hand off frame for higher layer processing.
14821482
* The function netif_rx() releases the sk_buff

drivers/net/iseries_veth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ static void veth_receive(struct veth_lpar_connection *cnx,
15241524

15251525
skb_put(skb, length);
15261526
skb->protocol = eth_type_trans(skb, dev);
1527-
skb->ip_summed = CHECKSUM_NONE;
1527+
skb_checksum_none_assert(skb);
15281528
netif_rx(skb); /* send it up */
15291529
dev->stats.rx_packets++;
15301530
dev->stats.rx_bytes += length;

drivers/net/ixgb/ixgb_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,15 +1905,15 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
19051905
*/
19061906
if ((rx_desc->status & IXGB_RX_DESC_STATUS_IXSM) ||
19071907
(!(rx_desc->status & IXGB_RX_DESC_STATUS_TCPCS))) {
1908-
skb->ip_summed = CHECKSUM_NONE;
1908+
skb_checksum_none_assert(skb);
19091909
return;
19101910
}
19111911

19121912
/* At this point we know the hardware did the TCP checksum */
19131913
/* now look at the TCP checksum error bit */
19141914
if (rx_desc->errors & IXGB_RX_DESC_ERRORS_TCPE) {
19151915
/* let the stack verify checksum errors */
1916-
skb->ip_summed = CHECKSUM_NONE;
1916+
skb_checksum_none_assert(skb);
19171917
adapter->hw_csum_rx_error++;
19181918
} else {
19191919
/* TCP checksum is good */

drivers/net/ixgbe/ixgbe_fcoe.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,13 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
304304
if (!ixgbe_rx_is_fcoe(rx_desc))
305305
goto ddp_out;
306306

307-
skb->ip_summed = CHECKSUM_UNNECESSARY;
308307
sterr = le32_to_cpu(rx_desc->wb.upper.status_error);
309308
fcerr = (sterr & IXGBE_RXDADV_ERR_FCERR);
310309
fceofe = (sterr & IXGBE_RXDADV_ERR_FCEOFE);
311310
if (fcerr == IXGBE_FCERR_BADCRC)
312-
skb->ip_summed = CHECKSUM_NONE;
311+
skb_checksum_none_assert(skb);
312+
else
313+
skb->ip_summed = CHECKSUM_UNNECESSARY;
313314

314315
if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
315316
fh = (struct fc_frame_header *)(skb->data +

drivers/net/ixgbe/ixgbe_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
980980
{
981981
u32 status_err = le32_to_cpu(rx_desc->wb.upper.status_error);
982982

983-
skb->ip_summed = CHECKSUM_NONE;
983+
skb_checksum_none_assert(skb);
984984

985985
/* Rx csum disabled */
986986
if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))

drivers/net/ixgbevf/ixgbevf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
356356
static inline void ixgbevf_rx_checksum(struct ixgbevf_adapter *adapter,
357357
u32 status_err, struct sk_buff *skb)
358358
{
359-
skb->ip_summed = CHECKSUM_NONE;
359+
skb_checksum_none_assert(skb);
360360

361361
/* Rx csum disabled */
362362
if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))

drivers/net/jme.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
936936
if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
937937
skb->ip_summed = CHECKSUM_UNNECESSARY;
938938
else
939-
skb->ip_summed = CHECKSUM_NONE;
939+
skb_checksum_none_assert(skb);
940940

941941
if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
942942
if (jme->vlgrp) {

drivers/net/ll_temac_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static void ll_temac_recv(struct net_device *ndev)
760760
skb_put(skb, length);
761761
skb->dev = ndev;
762762
skb->protocol = eth_type_trans(skb, ndev);
763-
skb->ip_summed = CHECKSUM_NONE;
763+
skb_checksum_none_assert(skb);
764764

765765
/* if we're doing rx csum offload, set it up */
766766
if (((lp->temac_features & TEMAC_FEATURE_RX_CSUM) != 0) &&

drivers/net/macb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
407407
}
408408

409409
skb_reserve(skb, RX_OFFSET);
410-
skb->ip_summed = CHECKSUM_NONE;
410+
skb_checksum_none_assert(skb);
411411
skb_put(skb, len);
412412

413413
for (frag = first_frag; ; frag = NEXT_RX(frag)) {

drivers/net/niu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3484,7 +3484,7 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
34843484
RCR_ENTRY_ERROR)))
34853485
skb->ip_summed = CHECKSUM_UNNECESSARY;
34863486
else
3487-
skb->ip_summed = CHECKSUM_NONE;
3487+
skb_checksum_none_assert(skb);
34883488
} else if (!(val & RCR_ENTRY_MULTI))
34893489
append_size = len - skb->len;
34903490

drivers/net/ns83820.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ static void rx_irq(struct net_device *ndev)
923923
if ((extsts & 0x002a0000) && !(extsts & 0x00540000)) {
924924
skb->ip_summed = CHECKSUM_UNNECESSARY;
925925
} else {
926-
skb->ip_summed = CHECKSUM_NONE;
926+
skb_checksum_none_assert(skb);
927927
}
928928
skb->protocol = eth_type_trans(skb, ndev);
929929
#ifdef NS83820_VLAN_ACCEL_SUPPORT

drivers/net/pasemi_mac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
808808
skb->csum = (macrx & XCT_MACRX_CSUM_M) >>
809809
XCT_MACRX_CSUM_S;
810810
} else
811-
skb->ip_summed = CHECKSUM_NONE;
811+
skb_checksum_none_assert(skb);
812812

813813
packets++;
814814
tot_bytes += len;

drivers/net/ps3_gelic_net.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,9 +956,9 @@ static void gelic_net_pass_skb_up(struct gelic_descr *descr,
956956
(!(data_error & GELIC_DESCR_DATA_ERROR_CHK_MASK)))
957957
skb->ip_summed = CHECKSUM_UNNECESSARY;
958958
else
959-
skb->ip_summed = CHECKSUM_NONE;
959+
skb_checksum_none_assert(skb);
960960
} else
961-
skb->ip_summed = CHECKSUM_NONE;
961+
skb_checksum_none_assert(skb);
962962

963963
/* update netdevice statistics */
964964
netdev->stats.rx_packets++;

drivers/net/qla3xxx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,7 @@ static void ql_process_mac_rx_intr(struct ql3_adapter *qdev,
20292029
dma_unmap_len(lrg_buf_cb2, maplen),
20302030
PCI_DMA_FROMDEVICE);
20312031
prefetch(skb->data);
2032-
skb->ip_summed = CHECKSUM_NONE;
2032+
skb_checksum_none_assert(skb);
20332033
skb->protocol = eth_type_trans(skb, qdev->ndev);
20342034

20352035
netif_receive_skb(skb);
@@ -2076,7 +2076,7 @@ static void ql_process_macip_rx_intr(struct ql3_adapter *qdev,
20762076
PCI_DMA_FROMDEVICE);
20772077
prefetch(skb2->data);
20782078

2079-
skb2->ip_summed = CHECKSUM_NONE;
2079+
skb_checksum_none_assert(skb2);
20802080
if (qdev->device_id == QL3022_DEVICE_ID) {
20812081
/*
20822082
* Copy the ethhdr from first buffer to second. This

drivers/net/qlcnic/qlcnic_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
13691369
adapter->stats.csummed++;
13701370
skb->ip_summed = CHECKSUM_UNNECESSARY;
13711371
} else {
1372-
skb->ip_summed = CHECKSUM_NONE;
1372+
skb_checksum_none_assert(skb);
13731373
}
13741374

13751375
skb->dev = adapter->netdev;

0 commit comments

Comments
 (0)