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

Commit 963bb101 authored by David Fries's avatar David Fries Committed by Linus Torvalds
Browse files

w1: have netlink search update kernel list 



Reorganize so the netlink connector one wire search command will update
the kernel list of detected slave devices.  Otherwise, a newly detected
device is unusable because unless it's in the kernel list of known devices
any commands will result in ENODEV status.

Signed-off-by: default avatarDavid Fries <David@Fries.net>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26a6afb9

drivers/w1/w1.c

+9 −3
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ void w1_reconnect_slaves(struct w1_family *f, int attach) 
	mutex_unlock(&w1_mlock);

}



static void w1_slave_found(struct w1_master *dev, u64 rn)

void w1_slave_found(struct w1_master *dev, u64 rn)

{

	struct w1_slave *sl;

	struct w1_reg_num *tmp;
@@ -933,14 +933,15 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb 
	}

}



void w1_search_process(struct w1_master *dev, u8 search_type)

void w1_search_process_cb(struct w1_master *dev, u8 search_type,

	w1_slave_found_callback cb)

{

	struct w1_slave *sl, *sln;



	list_for_each_entry(sl, &dev->slist, w1_slave_entry)

		clear_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);



	w1_search_devices(dev, search_type, w1_slave_found);

	w1_search_devices(dev, search_type, cb);



	list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {

		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl)
@@ -953,6 +954,11 @@ void w1_search_process(struct w1_master *dev, u8 search_type) 
		dev->search_count--;

}



static void w1_search_process(struct w1_master *dev, u8 search_type)

{

	w1_search_process_cb(dev, search_type, w1_slave_found);

}



int w1_process(void *data)

{

	struct w1_master *dev = (struct w1_master *) data;

drivers/w1/w1.h

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ void w1_destroy_master_attributes(struct w1_master *master); 
void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);

void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);

struct w1_slave *w1_search_slave(struct w1_reg_num *id);

void w1_search_process(struct w1_master *dev, u8 search_type);

void w1_slave_found(struct w1_master *dev, u64 rn);

void w1_search_process_cb(struct w1_master *dev, u8 search_type,

	w1_slave_found_callback cb);

struct w1_master *w1_search_master_id(u32 id);



/* Disconnect and reconnect devices in the given family.  Used for finding

drivers/w1/w1_netlink.c

+4 −1
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ static void w1_send_slave(struct w1_master *dev, u64 rn) 
	struct w1_netlink_cmd *cmd = (struct w1_netlink_cmd *)(hdr + 1);

	int avail;



	/* update kernel slave list */

	w1_slave_found(dev, rn);



	avail = dev->priv_size - cmd->len;



	if (avail > 8) {
@@ -85,7 +88,7 @@ static int w1_process_search_command(struct w1_master *dev, struct cn_msg *msg, 
	dev->priv = msg;

	dev->priv_size = avail;



	w1_search_devices(dev, search_type, w1_send_slave);

	w1_search_process_cb(dev, search_type, w1_send_slave);



	msg->ack = 0;

	cn_netlink_send(msg, 0, GFP_KERNEL);