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

Commit ce9f7fe3 authored by Randy Dunlap's avatar Randy Dunlap Committed by Jeff Garzik
Browse files

via-velocity uses INET interfaces 



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.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 683a2aa3

drivers/net/via-velocity.c

+13 −5
Original line number Diff line number Diff line
@@ -265,15 +265,19 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status); 
static 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(void) 
	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_dev *pdev) 
	return 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 notifier_block *nb, unsigned long notifi 
	}

	return NOTIFY_DONE;

}



#endif

#endif