@@ -104,7 +104,7 @@
#define DRV_MODULE_VERSION "1.61.15.v50.1"
#define DRV_MODULE_RELDATE "$DateTime: 2011/04/17 13:10:36 $"
#define DRV_MODULE_RELDATE "$DateTime: 2012/04/17 15:53:26 $"
#define BNX2X_BC_VER 0x040200
#if defined(BNX2X_UPSTREAM) && !defined(BNX2X_USE_INIT_VALUES) /* BNX2X_UPSTREAM */
@@ -13641,7 +13641,7 @@ static void poll_bnx2x(struct net_device *dev)
#endif
#else
/* HAVE_POLL_CONTROLLER is used in 2.4 kernels */
#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
#if (defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)) && !defined(__VMKLNX__)
static void poll_bnx2x(struct net_device *dev)
{
struct bnx2x *bp = netdev_priv(dev);
@@ -13675,8 +13675,10 @@ static const struct net_device_ops bnx2x_netdev_ops = {
.ndo_vlan_rx_register = bnx2x_vlan_rx_register,
#ifdef CONFIG_NET_POLL_CONTROLLER
#if !defined(__VMKLNX__) /* BNX2X_UPSTREAM */
.ndo_poll_controller = poll_bnx2x,
};
@@ -13872,8 +13874,10 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
dev->poll_controller = poll_bnx2x;
dev->features |= NETIF_F_SG;
dev->features |= NETIF_F_HW_CSUM;