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

Commit 48647fee authored by David S. Miller's avatar David S. Miller
Browse files

[W1]: Do not use NFLOG netlink number. 



Use the reserved by never used NETLINK_SKIP value instead.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 227510c7

drivers/w1/w1_int.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, 


	dev->groups = 23;

	dev->seq = 1;

	dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL);

	dev->nls = netlink_kernel_create(NETLINK_W1, NULL);

	if (!dev->nls) {

		printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",

			NETLINK_NFLOG, dev->dev.bus_id);

include/linux/netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/types.h>



#define NETLINK_ROUTE		0	/* Routing/device hook				*/

#define NETLINK_SKIP		1	/* Reserved for ENskip  			*/

#define NETLINK_W1		1	/* 1-wire subsystem				*/

#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/

#define NETLINK_FIREWALL	3	/* Firewalling hook				*/

#define NETLINK_TCPDIAG		4	/* TCP socket monitoring			*/