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

Commit 8baf82b3 authored by Greg KH's avatar Greg KH Committed by David S. Miller
Browse files

CONFIG_HOTPLUG removal from networking core 



CONFIG_HOTPLUG is always enabled now, so remove the unused code that was
trying to be compiled out when this option was disabled, in the
networking core.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03ce758e

net/core/net-sysfs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1334,7 +1334,6 @@ struct kobj_ns_type_operations net_ns_type_operations = { 
};

};

EXPORT_SYMBOL_GPL(net_ns_type_operations);

EXPORT_SYMBOL_GPL(net_ns_type_operations);





#ifdef CONFIG_HOTPLUG

static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)

static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)

{

{

	struct net_device *dev = to_net_dev(d);

	struct net_device *dev = to_net_dev(d);
@@ -1353,7 +1352,6 @@ static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) 
exit:

exit:

	return retval;

	return retval;

}

}

#endif





/*

/*

 *	netdev_release -- destroy and free a dead device.

 *	netdev_release -- destroy and free a dead device.
@@ -1382,9 +1380,7 @@ static struct class net_class = { 
#ifdef CONFIG_SYSFS

#ifdef CONFIG_SYSFS

	.dev_attrs = net_class_attributes,

	.dev_attrs = net_class_attributes,

#endif /* CONFIG_SYSFS */

#endif /* CONFIG_SYSFS */

#ifdef CONFIG_HOTPLUG

	.dev_uevent = netdev_uevent,

	.dev_uevent = netdev_uevent,

#endif

	.ns_type = &net_ns_type_operations,

	.ns_type = &net_ns_type_operations,

	.namespace = net_namespace,

	.namespace = net_namespace,

};

};

net/wireless/reg.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -2365,7 +2365,6 @@ int set_regdom(const struct ieee80211_regdomain *rd) 
	return r;

	return r;

}

}





#ifdef CONFIG_HOTPLUG

int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)

int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

{

	if (last_request && !last_request->processed) {

	if (last_request && !last_request->processed) {
@@ -2377,12 +2376,6 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) 




	return 0;

	return 0;

}

}

#else

int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	return -ENODEV;

}

#endif /* CONFIG_HOTPLUG */





void wiphy_regulatory_register(struct wiphy *wiphy)

void wiphy_regulatory_register(struct wiphy *wiphy)

{

{

net/wireless/sysfs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -77,13 +77,11 @@ static void wiphy_dev_release(struct device *dev) 
	cfg80211_dev_free(rdev);

	cfg80211_dev_free(rdev);

}

}





#ifdef CONFIG_HOTPLUG

static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)

static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)

{

{

	/* TODO, we probably need stuff here */

	/* TODO, we probably need stuff here */

	return 0;

	return 0;

}

}

#endif





static int wiphy_suspend(struct device *dev, pm_message_t state)

static int wiphy_suspend(struct device *dev, pm_message_t state)

{

{
@@ -134,9 +132,7 @@ struct class ieee80211_class = { 
	.owner = THIS_MODULE,

	.owner = THIS_MODULE,

	.dev_release = wiphy_dev_release,

	.dev_release = wiphy_dev_release,

	.dev_attrs = ieee80211_dev_attrs,

	.dev_attrs = ieee80211_dev_attrs,

#ifdef CONFIG_HOTPLUG

	.dev_uevent = wiphy_uevent,

	.dev_uevent = wiphy_uevent,

#endif

	.suspend = wiphy_suspend,

	.suspend = wiphy_suspend,

	.resume = wiphy_resume,

	.resume = wiphy_resume,

	.ns_type = &net_ns_type_operations,

	.ns_type = &net_ns_type_operations,