|
@@ -105,13 +105,13 @@ struct netconsole_target {
|
|
|
struct config_item item;
|
|
|
#endif
|
|
|
bool enabled;
|
|
|
- struct mutex mutex;
|
|
|
struct netpoll np;
|
|
|
};
|
|
|
|
|
|
#ifdef CONFIG_NETCONSOLE_DYNAMIC
|
|
|
|
|
|
static struct configfs_subsystem netconsole_subsys;
|
|
|
+static DEFINE_MUTEX(dynamic_netconsole_mutex);
|
|
|
|
|
|
static int __init dynamic_netconsole_init(void)
|
|
|
{
|
|
@@ -185,7 +185,6 @@ static struct netconsole_target *alloc_param_target(char *target_config)
|
|
|
strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
|
|
|
nt->np.local_port = 6665;
|
|
|
nt->np.remote_port = 6666;
|
|
|
- mutex_init(&nt->mutex);
|
|
|
eth_broadcast_addr(nt->np.remote_mac);
|
|
|
|
|
|
/* Parse parameters and setup netpoll */
|
|
@@ -562,10 +561,10 @@ static ssize_t netconsole_target_attr_store(struct config_item *item,
|
|
|
struct netconsole_target_attr *na =
|
|
|
container_of(attr, struct netconsole_target_attr, attr);
|
|
|
|
|
|
- mutex_lock(&nt->mutex);
|
|
|
+ mutex_lock(&dynamic_netconsole_mutex);
|
|
|
if (na->store)
|
|
|
ret = na->store(nt, buf, count);
|
|
|
- mutex_unlock(&nt->mutex);
|
|
|
+ mutex_unlock(&dynamic_netconsole_mutex);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -604,7 +603,6 @@ static struct config_item *make_netconsole_target(struct config_group *group,
|
|
|
strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
|
|
|
nt->np.local_port = 6665;
|
|
|
nt->np.remote_port = 6666;
|
|
|
- mutex_init(&nt->mutex);
|
|
|
eth_broadcast_addr(nt->np.remote_mac);
|
|
|
|
|
|
/* Initialize the config_item member */
|