vxge: Disable fcs stripping.

- Disable fcs stripping. The minimum frame size that can be received by the
hardware is 57 Bytes. A 64 Byte Ethernet frame with the vlan tag and fcs
stripped will result in a 56 Byte frame which will lock up the receive
engine. The work around is to disable fcs stripping in the hardware which
is done with a firmware upgrade. The fixes are -
1. Ensure that the correct firmware version is used.
2. Decrement the indicated packet length of the receive packet by 4 bytes
(FCS length).

Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa@neterion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 060549a75586ccfc69e504f257157fd4340fdd7d..eaf916b90aba7b8cff93125d2a24412f173344f7 100644 (file)
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -454,6 +454,8 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
                vxge_hw_ring_rxd_1b_get(ringh, dtr, &dma_sizes);
                pkt_length = dma_sizes;
 
+               pkt_length -= ETH_FCS_LEN;
+
                vxge_debug_rx(VXGE_TRACE,
                        "%s: %s:%d  Packet Length = %d",
                        ring->ndev->name, __func__, __LINE__, pkt_length);
@@ -4163,11 +4165,11 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
        }
 
        if (ll_config.device_hw_info.fw_version.major !=
-               VXGE_DRIVER_VERSION_MAJOR) {
+               VXGE_DRIVER_FW_VERSION_MAJOR) {
                vxge_debug_init(VXGE_ERR,
-                       "FW Ver.(maj): %d not driver's expected version: %d",
-                       ll_config.device_hw_info.fw_version.major,
-                       VXGE_DRIVER_VERSION_MAJOR);
+                       "%s: Incorrect firmware version."
+                       "Please upgrade the firmware to version 1.x.x",
+                       VXGE_DRIVER_NAME);
                ret = -EINVAL;
                goto _exit3;
        }

diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index a46f7fe938d2550ed5bc629bb8dbb72467c14b12..18d824c3ab93ea3f94f4b5e0334f562d55f512ee 100644 (file)
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -21,7 +21,7 @@
 
 #define VXGE_DRIVER_NAME               "vxge"
 #define VXGE_DRIVER_VENDOR             "Neterion, Inc"
-#define VXGE_DRIVER_VERSION_MAJOR 0
+#define VXGE_DRIVER_FW_VERSION_MAJOR   1
 
 #define DRV_VERSION    VXGE_VERSION_MAJOR"."VXGE_VERSION_MINOR"."\
        VXGE_VERSION_FIX"."VXGE_VERSION_BUILD"-"\