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

Commit 12cbcfd3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan

parents 0aad191c c4835d81

net/ieee802154/dgram.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname, 
}



static int dgram_setsockopt(struct sock *sk, int level, int optname,

		    char __user *optval, int __user optlen)

		    char __user *optval, int optlen)

{

	struct dgram_sock *ro = dgram_sk(sk);

	int val;

net/ieee802154/netlink.c

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <net/ieee802154_netdev.h>



static unsigned int ieee802154_seq_num;

static DEFINE_SPINLOCK(ieee802154_seq_lock);



static struct genl_family ieee802154_coordinator_family = {

	.id		= GENL_ID_GENERATE,
@@ -57,12 +58,15 @@ static struct sk_buff *ieee802154_nl_create(int flags, u8 req) 
{

	void *hdr;

	struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);

	unsigned long f;



	if (!msg)

		return NULL;



	spin_lock_irqsave(&ieee802154_seq_lock, f);

	hdr = genlmsg_put(msg, 0, ieee802154_seq_num++,

			&ieee802154_coordinator_family, flags, req);

	spin_unlock_irqrestore(&ieee802154_seq_lock, f);

	if (!hdr) {

		nlmsg_free(msg);

		return NULL;

net/ieee802154/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname, 
}



static int raw_setsockopt(struct sock *sk, int level, int optname,

		    char __user *optval, int __user optlen)

		    char __user *optval, int optlen)

{

	return -EOPNOTSUPP;

}