Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257ddbda authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netdev: remove HAVE_ leftovers 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b50c2ea7

drivers/net/bnx2.c

+2 −2
Original line number Diff line number Diff line
@@ -7668,7 +7668,7 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu) 
	return (bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size));

}



#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)

#ifdef CONFIG_NET_POLL_CONTROLLER

static void

poll_bnx2(struct net_device *dev)

{
@@ -8280,7 +8280,7 @@ static const struct net_device_ops bnx2_netdev_ops = { 
#ifdef BCM_VLAN

	.ndo_vlan_rx_register	= bnx2_vlan_rx_register,

#endif

#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= poll_bnx2,

#endif

};

drivers/net/bnx2x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -11731,7 +11731,7 @@ static void bnx2x_vlan_rx_register(struct net_device *dev, 


#endif



#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)

#ifdef CONFIG_NET_POLL_CONTROLLER

static void poll_bnx2x(struct net_device *dev)

{

	struct bnx2x *bp = netdev_priv(dev);
@@ -11755,7 +11755,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
#ifdef BCM_VLAN

	.ndo_vlan_rx_register	= bnx2x_vlan_rx_register,

#endif

#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= poll_bnx2x,

#endif

};

drivers/net/cassini.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
#define cas_page_unmap(x)    kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ)

#define CAS_NCPUS            num_online_cpus()



#if defined(CONFIG_CASSINI_NAPI) && defined(HAVE_NETDEV_POLL)

#ifdef CONFIG_CASSINI_NAPI

#define USE_NAPI

#define cas_skb_release(x)  netif_receive_skb(x)

#else

drivers/net/ixgbevf/ixgbevf_main.c

+0 −18
Original line number Diff line number Diff line
@@ -3262,7 +3262,6 @@ static void ixgbevf_shutdown(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



#ifdef HAVE_NET_DEVICE_OPS

static const struct net_device_ops ixgbe_netdev_ops = {

	.ndo_open		= &ixgbevf_open,

	.ndo_stop		= &ixgbevf_close,
@@ -3278,29 +3277,12 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_vlan_rx_add_vid	= &ixgbevf_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= &ixgbevf_vlan_rx_kill_vid,

};

#endif /* HAVE_NET_DEVICE_OPS */



static void ixgbevf_assign_netdev_ops(struct net_device *dev)

{

	struct ixgbevf_adapter *adapter;

	adapter = netdev_priv(dev);

#ifdef HAVE_NET_DEVICE_OPS

	dev->netdev_ops = &ixgbe_netdev_ops;

#else /* HAVE_NET_DEVICE_OPS */

	dev->open = &ixgbevf_open;

	dev->stop = &ixgbevf_close;



	dev->hard_start_xmit = &ixgbevf_xmit_frame;



	dev->get_stats = &ixgbevf_get_stats;

	dev->set_multicast_list = &ixgbevf_set_rx_mode;

	dev->set_mac_address = &ixgbevf_set_mac;

	dev->change_mtu = &ixgbevf_change_mtu;

	dev->tx_timeout = &ixgbevf_tx_timeout;

	dev->vlan_rx_register = &ixgbevf_vlan_rx_register;

	dev->vlan_rx_add_vid = &ixgbevf_vlan_rx_add_vid;

	dev->vlan_rx_kill_vid = &ixgbevf_vlan_rx_kill_vid;

#endif /* HAVE_NET_DEVICE_OPS */

	ixgbevf_set_ethtool_ops(dev);

	dev->watchdog_timeo = 5 * HZ;

}

drivers/net/meth.c

+0 −3
Original line number Diff line number Diff line
@@ -51,14 +51,11 @@ 


static const char *meth_str="SGI O2 Fast Ethernet";



#define HAVE_TX_TIMEOUT

/* The maximum time waited (in jiffies) before assuming a Tx failed. (400ms) */

#define TX_TIMEOUT (400*HZ/1000)



#ifdef HAVE_TX_TIMEOUT

static int timeout = TX_TIMEOUT;

module_param(timeout, int, 0);

#endif



/*

 * This structure is private to each device. It is used to pass