summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2012-02-10 15:04:32 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-24 01:56:24 -0800
commiteeb69aa443e8cdc945405c48f21ce03f5a3b1f86 (patch)
treea86ea6fafea4e2b1a0e57f6599ba35f223d2943c
parentd95089dc54ad07a8d10292fd06963b29b059ed5b (diff)
downloadop-kernel-dev-eeb69aa443e8cdc945405c48f21ce03f5a3b1f86.zip
op-kernel-dev-eeb69aa443e8cdc945405c48f21ce03f5a3b1f86.tar.gz
8139too: Support RX-FCS flag.
This allows the NIC to pass the Ethernet FCS on up the stack, and is useful when sniffing networks. Signed-off-by: Ben Greear <greearb@candelatech.com>
-rw-r--r--drivers/net/ethernet/realtek/8139too.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 1b9a090..abd6aca 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -1023,6 +1023,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
dev->vlan_features = dev->features;
dev->hw_features |= NETIF_F_RXALL;
+ dev->hw_features |= NETIF_F_RXFCS;
dev->irq = pdev->irq;
@@ -1970,7 +1971,10 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
/* read size+status of next frame from DMA ring buffer */
rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));
rx_size = rx_status >> 16;
- pkt_size = rx_size - 4;
+ if (likely(!(dev->features & NETIF_F_RXFCS)))
+ pkt_size = rx_size - 4;
+ else
+ pkt_size = rx_size;
netif_dbg(tp, rx_status, dev, "%s() status %04x, size %04x, cur %04x\n",
__func__, rx_status, rx_size, cur_rx);
OpenPOWER on IntegriCloud