diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /drivers/net/bnx2x/bnx2x_cmn.c | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index 459614d2d7bc..94d5f59d5a6f 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c | |||
| @@ -1680,7 +1680,7 @@ static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb) | |||
| 1680 | rc = XMIT_PLAIN; | 1680 | rc = XMIT_PLAIN; |
| 1681 | 1681 | ||
| 1682 | else { | 1682 | else { |
| 1683 | if (skb->protocol == htons(ETH_P_IPV6)) { | 1683 | if (vlan_get_protocol(skb) == htons(ETH_P_IPV6)) { |
| 1684 | rc = XMIT_CSUM_V6; | 1684 | rc = XMIT_CSUM_V6; |
| 1685 | if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP) | 1685 | if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP) |
| 1686 | rc |= XMIT_CSUM_TCP; | 1686 | rc |= XMIT_CSUM_TCP; |