diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /net/core | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 63ec4bf89b29..52fea5b28ca6 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1457,7 +1457,9 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol) | |||
| 1457 | ((features & NETIF_F_IP_CSUM) && | 1457 | ((features & NETIF_F_IP_CSUM) && |
| 1458 | protocol == htons(ETH_P_IP)) || | 1458 | protocol == htons(ETH_P_IP)) || |
| 1459 | ((features & NETIF_F_IPV6_CSUM) && | 1459 | ((features & NETIF_F_IPV6_CSUM) && |
| 1460 | protocol == htons(ETH_P_IPV6))); | 1460 | protocol == htons(ETH_P_IPV6)) || |
| 1461 | ((features & NETIF_F_FCOE_CRC) && | ||
| 1462 | protocol == htons(ETH_P_FCOE))); | ||
| 1461 | } | 1463 | } |
| 1462 | 1464 | ||
| 1463 | static bool dev_can_checksum(struct net_device *dev, struct sk_buff *skb) | 1465 | static bool dev_can_checksum(struct net_device *dev, struct sk_buff *skb) |