netdev: bfin_mac: add support for wake-on-lan magic packets

[safe/jmp/linux-2.6] / drivers / net / bnx2x_main.c

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 613f727..2bc35c7 100644 (file)
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -1617,7 +1617,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                        rx_buf = &fp->rx_buf_ring[bd_cons];
                        skb = rx_buf->skb;
                        prefetch(skb);
-                       prefetch((u8 *)skb + 256);
                        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
                        pad = cqe->fast_path_cqe.placement_offset;
 
@@ -1668,7 +1667,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                                        dma_unmap_addr(rx_buf, mapping),
                                                   pad + RX_COPY_THRESH,
                                                   DMA_FROM_DEVICE);
-                       prefetch(skb);
                        prefetch(((char *)(skb)) + 128);
 
                        /* is this an error packet? */
@@ -1728,7 +1726,7 @@ reuse_rx:
 
                        skb->protocol = eth_type_trans(skb, bp->dev);
 
-                       if ((bp->dev->features & ETH_FLAG_RXHASH) &&
+                       if ((bp->dev->features & NETIF_F_RXHASH) &&
                            (cqe_fp_status_flags &
                             ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))
                                skb->rxhash = le32_to_cpu(