mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 12:50:53 +07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
This commit is contained in:
commit
12cbcfd386
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user