@@ -74,7 +74,7 @@ static const char ixgbe_driver_string[] =
#define FPGA
#define DRV_VERSION "2.0.84.8.2-10vmw" DRIVERNAPI DRV_HW_PERF FPGA
#define DRV_VERSION "2.0.84.8.2-11vmw" DRIVERNAPI DRV_HW_PERF FPGA
const char ixgbe_driver_version[] = DRV_VERSION;
static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
/* ixgbe_pci_tbl - PCI Device ID Table
@@ -6095,7 +6095,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
adapter->dcb_cfg.bw_percentage[DCB_TX_CONFIG][0] = 100;
adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
adapter->dcb_cfg.rx_pba_cfg = pba_equal;
adapter->dcb_cfg.pfc_mode_enable = true;
adapter->dcb_cfg.pfc_mode_enable = false;
adapter->dcb_cfg.round_robin_enable = false;
adapter->dcb_set_bitmap = 0x00;
@@ -8281,18 +8281,24 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
DPRINTK(TX_ERR, INFO, "my (preferred) node is: %d\n", adapter->node);
#ifndef __VMKLNX__
if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
hw->fc.requested_mode = ixgbe_fc_pfc;
hw->fc.current_mode = ixgbe_fc_pfc; /* init for ethtool output */
}
#endif
#ifdef MAX_SKB_FRAGS
#ifdef NETIF_F_HW_VLAN_TX
netdev->features = NETIF_F_SG |
NETIF_F_IP_CSUM |
NETIF_F_HW_VLAN_TX |
NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
#ifdef __VMKLNX__
NETIF_F_HW_VLAN_RX;
#else
#endif /*__VMKLNX__*/
netdev->features = NETIF_F_SG | NETIF_F_IP_CSUM;