diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-02 16:07:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-02 22:06:22 -0400 |
commit | bc8acf2c8c3e43fcc192762a9f964b3e9a17748b (patch) | |
tree | e3a91392771a22390e59c24fcb7bad3045ce17d1 /drivers/net/ixgbe | |
parent | 7162f6691e9d39d8d866574687cddb3f1ec65d72 (diff) |
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_fcoe.c | 5 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c index 86fa07cb061d..2f1de8b90f9e 100644 --- a/drivers/net/ixgbe/ixgbe_fcoe.c +++ b/drivers/net/ixgbe/ixgbe_fcoe.c | |||
@@ -304,12 +304,13 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, | |||
304 | if (!ixgbe_rx_is_fcoe(rx_desc)) | 304 | if (!ixgbe_rx_is_fcoe(rx_desc)) |
305 | goto ddp_out; | 305 | goto ddp_out; |
306 | 306 | ||
307 | skb->ip_summed = CHECKSUM_UNNECESSARY; | ||
308 | sterr = le32_to_cpu(rx_desc->wb.upper.status_error); | 307 | sterr = le32_to_cpu(rx_desc->wb.upper.status_error); |
309 | fcerr = (sterr & IXGBE_RXDADV_ERR_FCERR); | 308 | fcerr = (sterr & IXGBE_RXDADV_ERR_FCERR); |
310 | fceofe = (sterr & IXGBE_RXDADV_ERR_FCEOFE); | 309 | fceofe = (sterr & IXGBE_RXDADV_ERR_FCEOFE); |
311 | if (fcerr == IXGBE_FCERR_BADCRC) | 310 | 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; | ||
313 | 314 | ||
314 | if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q)) | 315 | if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q)) |
315 | fh = (struct fc_frame_header *)(skb->data + | 316 | fh = (struct fc_frame_header *)(skb->data + |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 5e4dc1b0a1bd..3aafe94741ba 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -980,7 +980,7 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter, | |||
980 | { | 980 | { |
981 | u32 status_err = le32_to_cpu(rx_desc->wb.upper.status_error); | 981 | u32 status_err = le32_to_cpu(rx_desc->wb.upper.status_error); |
982 | 982 | ||
983 | skb->ip_summed = CHECKSUM_NONE; | 983 | skb_checksum_none_assert(skb); |
984 | 984 | ||
985 | /* Rx csum disabled */ | 985 | /* Rx csum disabled */ |
986 | if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED)) | 986 | if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED)) |