via-velocity uses INET interfaces
Subsystems (2)
PATCH 1/1 via-velocity uses INET interfaces
From: Randy Dunlap <[email protected]>
via-velocity doesn't build when CONFIG_INET=n:
drivers/built-in.o: In function `velocity_unregister_notifier':
via-velocity.c:(.text+0xe9b46): undefined reference to unregister_inetaddr_notifier' drivers/built-in.o: In function velocity_init_module':
via-velocity.c:(.init.text+0xa027): undefined reference to `register_inetaddr_notifier'
I wanted to make this change in drivers/net/Kconfig, but this isn't legal kconfig language:
config VIA_VELOCITY
tristate "VIA Velocity support"
depends on NET_PCI && PCI
+ depends on INET if PM
select CRC32
select CRC_CCITT
select MII
so fix it in via-velocity.c instead.
Builds with all 4 combinations of CONFIG_NET & CONFIG_PM.
--- drivers/net/via-velocity.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/net/via-velocity.c +13 -5
@@ -265,15 +265,19 @@ static int velocity_set_media_mode(strucstatic int velocity_suspend (struct pci_dev *pdev,pm_message_t state);static int velocity_resume (struct pci_dev *pdev); +static DEFINE_SPINLOCK (velocity_dev_list_lock); +static LIST_HEAD (velocity_dev_list); + +#endif + +#if defined(CONFIG_PM ) && defined(CONFIG_INET ) +static int velocity_netdev_event (struct notifier_block *nb,unsigned long notification,void *ptr);static struct notifier_block velocity_inetaddr_notifier = { .notifier_call = velocity_netdev_event, }; -static DEFINE_SPINLOCK (velocity_dev_list_lock); -static LIST_HEAD (velocity_dev_list); -static void velocity_register_notifier (void ) {register_inetaddr_notifier (&velocity_inetaddr_notifier);
@@ -284,12 +288,12 @@ static void velocity_unregister_notifier unregister_inetaddr_notifier(&velocity_inetaddr_notifier); } -#else /* CONFIG_PM */ +#else #define velocity_register_notifier () do {} while (0)#define velocity_unregister_notifier () do {} while (0) -#endif /* !CONFIG_PM */ +#endif /* * Internal board variants. At the moment we have only one
@@ -3292,6 +3296,8 @@ static int velocity_resume(struct pci_dereturn 0 ; } +#ifdef CONFIG_INET +static int velocity_netdev_event (struct notifier_block *nb,unsigned long notification,void *ptr) {struct in_ifaddr *ifa = (struct in_ifaddr *) ptr;
@@ -3312,4 +3318,6 @@ static int velocity_netdev_event(struct }return NOTIFY_DONE ; } + +#endif #endif
---
Jeff Garzik
AppliedQuoted 1 line · Randy Dunlap
From: Randy Dunlap <[email protected]>
applied