* drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function)
@ 2010-01-26 8:57 ` Geert Uytterhoeven
0 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2010-01-26 8:57 UTC (permalink / raw)
To: Alexey Dobriyan, David S. Miller; +Cc: Linux-Next, netdev, linux-kernel
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 <adobriyan@gmail.com>
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 <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 7+ messages in thread* drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function) @ 2010-01-26 8:57 ` Geert Uytterhoeven 0 siblings, 0 replies; 7+ messages in thread From: Geert Uytterhoeven @ 2010-01-26 8:57 UTC (permalink / raw) To: Alexey Dobriyan, David S. Miller; +Cc: Linux-Next, netdev, linux-kernel 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 <adobriyan@gmail.com> 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 <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function) 2010-01-26 8:57 ` Geert Uytterhoeven (?) @ 2010-01-26 13:18 ` David Miller 2010-01-26 19:17 ` [PATCH] netdev: remove HAVE_ leftovers Alexey Dobriyan -1 siblings, 1 reply; 7+ messages in thread From: David Miller @ 2010-01-26 13:18 UTC (permalink / raw) To: geert; +Cc: adobriyan, linux-next, netdev, linux-kernel From: Geert Uytterhoeven <geert@linux-m68k.org> Date: Tue, 26 Jan 2010 09:57:05 +0100 > 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 <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net> --- drivers/net/ariadne.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index c35af3e..e2c2024 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -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) -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] netdev: remove HAVE_ leftovers 2010-01-26 13:18 ` David Miller @ 2010-01-26 19:17 ` Alexey Dobriyan 2010-01-27 0:32 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Alexey Dobriyan @ 2010-01-26 19:17 UTC (permalink / raw) To: David Miller; +Cc: geert, linux-next, netdev, linux-kernel On Tue, Jan 26, 2010 at 05:18:17AM -0800, David Miller wrote: > 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 <adobriyan@gmail.com> --- 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(-) --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -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 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c @@ -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 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -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; ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] netdev: remove HAVE_ leftovers 2010-01-26 19:17 ` [PATCH] netdev: remove HAVE_ leftovers Alexey Dobriyan @ 2010-01-27 0:32 ` David Miller 2010-01-27 20:17 ` [PATCH] netdev: remove more " Alexey Dobriyan 0 siblings, 1 reply; 7+ messages in thread From: David Miller @ 2010-01-27 0:32 UTC (permalink / raw) To: adobriyan; +Cc: geert, linux-next, netdev, linux-kernel From: Alexey Dobriyan <adobriyan@gmail.com> Date: Tue, 26 Jan 2010 21:17:27 +0200 > On Tue, Jan 26, 2010 at 05:18:17AM -0800, David Miller wrote: >> 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 <adobriyan@gmail.com> 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] netdev: remove more HAVE_ leftovers 2010-01-27 0:32 ` David Miller @ 2010-01-27 20:17 ` Alexey Dobriyan 2010-01-28 14:01 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Alexey Dobriyan @ 2010-01-27 20:17 UTC (permalink / raw) To: David Miller; +Cc: geert, linux-next, netdev, linux-kernel On Tue, Jan 26, 2010 at 04:32:56PM -0800, David Miller wrote: > From: Alexey Dobriyan <adobriyan@gmail.com> > Date: Tue, 26 Jan 2010 21:17:27 +0200 > > > On Tue, Jan 26, 2010 at 05:18:17AM -0800, David Miller wrote: > >> 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 <adobriyan@gmail.com> > > What about HAVE_POLL_CONTROLLER and some other remaining stuff? Ick, I thought I left some compile breakage :^) > 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 <adobriyan@gmail.com> --- 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(-) --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -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 }; --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -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 }; --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -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 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c @@ -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; } --- a/drivers/net/meth.c +++ b/drivers/net/meth.c @@ -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 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -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; ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] netdev: remove more HAVE_ leftovers 2010-01-27 20:17 ` [PATCH] netdev: remove more " Alexey Dobriyan @ 2010-01-28 14:01 ` David Miller 0 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2010-01-28 14:01 UTC (permalink / raw) To: adobriyan; +Cc: geert, linux-next, netdev, linux-kernel From: Alexey Dobriyan <adobriyan@gmail.com> Date: Wed, 27 Jan 2010 22:17:41 +0200 > [PATCH] netdev: remove more HAVE_ leftovers > > Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Applied, thanks Alexey. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-01-28 14:01 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-01-26 8:57 drivers/net/ariadne.c:165: error: 'set_multicast_list' undeclared here (not in a function) Geert Uytterhoeven 2010-01-26 8:57 ` Geert Uytterhoeven 2010-01-26 13:18 ` David Miller 2010-01-26 19:17 ` [PATCH] netdev: remove HAVE_ leftovers Alexey Dobriyan 2010-01-27 0:32 ` David Miller 2010-01-27 20:17 ` [PATCH] netdev: remove more " Alexey Dobriyan 2010-01-28 14:01 ` David Miller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.