Skip to contentSkip to conversation

drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function)

PATCH In review Geert Uytterhoeven 3 participants 6 messages Jan 26, 2010 – Jan 28, 2010

Subsystems (4)
Networking Network drivers Staging Linux-next tree
lore
Share & tools
lore

Geert Uytterhoeven

author
#0 lore raw

http://kisskb.ellerman.id.au/kisskb/buildresult/2076964/

drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function)

Seems to be broken by:

commit a271623f871dda970319ca15dfad3a8c8c36249f

Author: Alexey Dobriyan <[email protected]>
Date:   Fri Jan 22 10:13:10 2010 +0000

netdev: remove certain HAVE_ macros

After netdev_ops compat code HAVE_* macros aren't needed, in fact they _will_ result in compile breakage for out of tree drivers.

Signed-off-by Alexey Dobriyan <[email protected]>
Signed-off-by David S. Miller <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer
#1 lore raw

From: Geert Uytterhoeven <[email protected]>
Date: Tue, 26 Jan 2010 09:57:05 +0100

Quoted 6 lines

http://kisskb.ellerman.id.au/kisskb/buildresult/2076964/

drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function)

Seems to be broken by:

I'll fix this with the patch below.

Alexey, please go through at least drivers/net and look at the other stale references to these HAVE_* macros.

For example I still see a bunch of HAVE_POLL_CONTROLLER stuff.

Thanks.

ariadne: Fix build.

References removed HAVE_MULTICAST.

Reporeted-by Geert Uytterhoeven <[email protected]>
Signed-off-by David S. Miller <[email protected]>
---
 drivers/net/ariadne.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/ariadne.c +0 -2
index c35af3e..e2c2024 100644
@@ -123,9 +123,7 @@ static void ariadne_reset(struct net_device *dev);
 static irqreturn_t ariadne_interrupt(int irq, void *data);
 static int ariadne_close(struct net_device *dev);
 static struct net_device_stats *ariadne_get_stats(struct net_device *dev);
-#ifdef HAVE_MULTICAST
 static void set_multicast_list(struct net_device *dev);
-#endif
 
 
 static void memcpyw(volatile u_short *dest, u_short *src, int len)
Signature · 1 line
1.6.6.1
#2 lore raw

PATCH 1/1 netdev: remove HAVE_ leftovers

Quoted 2 lines · David Miller

Alexey, please go through at least drivers/net and look at the other stale references to these HAVE_* macros.

My apologies.

[PATCH] netdev: remove HAVE_ leftovers

Signed-off-by Alexey Dobriyan <[email protected]>

---

 drivers/net/cassini.c                  |    2 +-
 drivers/net/meth.c                     |    3 ---
 drivers/staging/wlags49_h2/wl_netdev.c |    6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)
drivers/net/cassini.c +1 -1
@@ -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/meth.c +0 -3
@@ -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
drivers/staging/wlags49_h2/wl_netdev.c +0 -6
@@ -1194,9 +1194,7 @@ static const struct net_device_ops wl_netdev_ops =
     .ndo_stop               = &wl_adapter_close,
     .ndo_do_ioctl           = &wl_ioctl,
 
-#ifdef HAVE_TX_TIMEOUT
     .ndo_tx_timeout         = &wl_tx_timeout,
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
     .ndo_poll_controller    = wl_poll,

@@ -1270,9 +1268,7 @@ struct net_device * wl_device_alloc( void )
     dev->stop               = &wl_adapter_close;
     dev->do_ioctl           = &wl_ioctl;
 
-#ifdef HAVE_TX_TIMEOUT
     dev->tx_timeout         = &wl_tx_timeout;
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
     dev->poll_controller = wl_poll;

@@ -1280,9 +1276,7 @@ struct net_device * wl_device_alloc( void )
 
 #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
 
-#ifdef HAVE_TX_TIMEOUT
     dev->watchdog_timeo     = TX_TIMEOUT;
-#endif
 
     dev->ethtool_ops	    = &wl_ethtool_ops;
maintainer
#3 lore raw

Re: [PATCH] netdev: remove HAVE_ leftovers

From: Alexey Dobriyan <[email protected]>
Date: Tue, 26 Jan 2010 21:17:27 +0200

Quoted 10 lines · David Miller
Quoted 2 lines

Alexey, please go through at least drivers/net and look at the other stale references to these HAVE_* macros.

My apologies.

[PATCH] netdev: remove HAVE_ leftovers

Signed-off-by Alexey Dobriyan <[email protected]>

What about HAVE_POLL_CONTROLLER and some other remaining stuff?

drivers/net/bnx2.c:#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER) drivers/net/bnx2x_main.c:#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER) drivers/net/ixgbevf/ixgbevf_main.c:#ifdef HAVE_TX_MQ drivers/net/ixgbevf/ixgbevf_main.c:#ifndef HAVE_NETDEV_NAPI_LIST drivers/net/ixgbevf/ixgbevf_main.c:#ifdef HAVE_NET_DEVICE_OPS

#4 lore raw

PATCH 1/1 netdev: remove more HAVE_ leftovers

Quoted 7 lines · David Miller

From: Alexey Dobriyan <[email protected]>
Date: Tue, 26 Jan 2010 21:17:27 +0200

Quoted 4 lines · David Miller
Quoted 2 lines

Alexey, please go through at least drivers/net and look at the other stale references to these HAVE_* macros.

Quoted 8 lines
Quoted 6 lines

My apologies.

[PATCH] netdev: remove HAVE_ leftovers

Signed-off-by Alexey Dobriyan <[email protected]>

What about HAVE_POLL_CONTROLLER and some other remaining stuff?

Ick, I thought I left some compile breakage :^)

Quoted 5 lines

drivers/net/bnx2.c:#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER) drivers/net/bnx2x_main.c:#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER) drivers/net/ixgbevf/ixgbevf_main.c:#ifdef HAVE_TX_MQ drivers/net/ixgbevf/ixgbevf_main.c:#ifndef HAVE_NETDEV_NAPI_LIST drivers/net/ixgbevf/ixgbevf_main.c:#ifdef HAVE_NET_DEVICE_OPS

As for HAVE_TX_MQ and HAVE_NETDEV_NAPI_LIST, I have no clue what's going on.

[PATCH] netdev: remove more HAVE_ leftovers

Signed-off-by Alexey Dobriyan <[email protected]>

---

 drivers/net/bnx2.c                     |    4 ++--
 drivers/net/bnx2x_main.c               |    4 ++--
 drivers/net/cassini.c                  |    2 +-
 drivers/net/ixgbevf/ixgbevf_main.c     |   18 ------------------
 drivers/net/meth.c                     |    3 ---
 drivers/staging/wlags49_h2/wl_netdev.c |    6 ------
 6 files changed, 5 insertions(+), 32 deletions(-)
drivers/net/bnx2.c +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
drivers/staging/wlags49_h2/wl_netdev.c +0 -6
@@ -1194,9 +1194,7 @@ static const struct net_device_ops wl_netdev_ops =
     .ndo_stop               = &wl_adapter_close,
     .ndo_do_ioctl           = &wl_ioctl,
 
-#ifdef HAVE_TX_TIMEOUT
     .ndo_tx_timeout         = &wl_tx_timeout,
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
     .ndo_poll_controller    = wl_poll,

@@ -1270,9 +1268,7 @@ struct net_device * wl_device_alloc( void )
     dev->stop               = &wl_adapter_close;
     dev->do_ioctl           = &wl_ioctl;
 
-#ifdef HAVE_TX_TIMEOUT
     dev->tx_timeout         = &wl_tx_timeout;
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
     dev->poll_controller = wl_poll;

@@ -1280,9 +1276,7 @@ struct net_device * wl_device_alloc( void )
 
 #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
 
-#ifdef HAVE_TX_TIMEOUT
     dev->watchdog_timeo     = TX_TIMEOUT;
-#endif
 
     dev->ethtool_ops	    = &wl_ethtool_ops;