diff options
| author | Dmitry Kravkov | 2011-06-14 03:33:02 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-06-15 16:56:13 +0200 |
| commit | 93ef5c02a436000d6b90ff59c9d25563000eee7f (patch) | |
| tree | 4825ef3641685d2d1dc0e13f29cffeff5cf0b6c2 /drivers/net/bnx2x/bnx2x_cmn.c | |
| parent | bnx2x: remove references to intr_sem (diff) | |
| download | kernel-qcow2-linux-93ef5c02a436000d6b90ff59c9d25563000eee7f.tar.gz kernel-qcow2-linux-93ef5c02a436000d6b90ff59c9d25563000eee7f.tar.xz kernel-qcow2-linux-93ef5c02a436000d6b90ff59c9d25563000eee7f.zip | |
bnx2x: put start bd csum in separate function
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index 14e7eb15e518..3a2a50c36b49 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -2136,6 +2136,24 @@ static inline u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb, sizeof(struct udphdr) - skb->data; } +static inline void bnx2x_set_sbd_csum(struct bnx2x *bp, struct sk_buff *skb, + struct eth_tx_start_bd *tx_start_bd, u32 xmit_type) +{ + + tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_L4_CSUM; + + if (xmit_type & XMIT_CSUM_V4) + tx_start_bd->bd_flags.as_bitfield |= + ETH_TX_BD_FLAGS_IP_CSUM; + else + tx_start_bd->bd_flags.as_bitfield |= + ETH_TX_BD_FLAGS_IPV6; + + if (!(xmit_type & XMIT_CSUM_TCP)) + tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_IS_UDP; + +} + /** * bnx2x_set_pbd_csum - update PBD with checksum and return header length * @@ -2307,20 +2325,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) /* turn on parsing and get a BD */ bd_prod = TX_BD(NEXT_TX_IDX(bd_prod)); - if (xmit_type & XMIT_CSUM) { - tx_start_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_L4_CSUM; - - if (xmit_type & XMIT_CSUM_V4) - tx_start_bd->bd_flags.as_bitfield |= - ETH_TX_BD_FLAGS_IP_CSUM; - else - tx_start_bd->bd_flags.as_bitfield |= - ETH_TX_BD_FLAGS_IPV6; - - if (!(xmit_type & XMIT_CSUM_TCP)) - tx_start_bd->bd_flags.as_bitfield |= - ETH_TX_BD_FLAGS_IS_UDP; - } + if (xmit_type & XMIT_CSUM) + bnx2x_set_sbd_csum(bp, skb, tx_start_bd, xmit_type); if (CHIP_IS_E2(bp)) { pbd_e2 = &fp->tx_desc_ring[bd_prod].parse_bd_e2; |