git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
drivers
/
net
/
cxgb4vf
/
sge.c
diff --git
a/drivers/net/cxgb4vf/sge.c
b/drivers/net/cxgb4vf/sge.c
index
bb65121
..
5fd75fd
100644
(file)
--- a/
drivers/net/cxgb4vf/sge.c
+++ b/
drivers/net/cxgb4vf/sge.c
@@
-41,6
+41,7
@@
#include <net/ipv6.h>
#include <net/tcp.h>
#include <linux/dma-mapping.h>
#include <net/ipv6.h>
#include <net/tcp.h>
#include <linux/dma-mapping.h>
+#include <linux/prefetch.h>
#include "t4vf_common.h"
#include "t4vf_defs.h"
#include "t4vf_common.h"
#include "t4vf_defs.h"
@@
-1555,8
+1556,8
@@
int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
pi = netdev_priv(skb->dev);
rxq->stats.pkts++;
pi = netdev_priv(skb->dev);
rxq->stats.pkts++;
- if (csum_ok && (
pi->rx_offload & RX_CSO) && !pkt->err_vec
&&
- (be32_to_cpu(pkt->l2info) & (RXF_UDP|RXF_TCP))) {
+ if (csum_ok && (
rspq->netdev->features & NETIF_F_RXCSUM)
&&
+
!pkt->err_vec &&
(be32_to_cpu(pkt->l2info) & (RXF_UDP|RXF_TCP))) {
if (!pkt->ip_frag)
skb->ip_summed = CHECKSUM_UNNECESSARY;
else {
if (!pkt->ip_frag)
skb->ip_summed = CHECKSUM_UNNECESSARY;
else {