projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
ieee802154
/
raw.c
diff --git
a/net/ieee802154/raw.c
b/net/ieee802154/raw.c
index 3ffcf4a9de01c8d35d062c76e4ad115965bb3af4..1674b115c89132b47527d7c4b29f21f8d20f15a9 100644
(file)
--- a/
net/ieee802154/raw.c
+++ b/
net/ieee802154/raw.c
@@
-150,7
+150,7
@@
static int raw_sendmsg(struct kiocb *iocb, struct sock *sk,
skb_reset_mac_header(skb);
skb_reset_network_header(skb);
skb_reset_mac_header(skb);
skb_reset_network_header(skb);
- err = memcpy_from
iovec(skb_put(skb, size), msg->msg_iov
, size);
+ err = memcpy_from
_msg(skb_put(skb, size), msg
, size);
if (err < 0)
goto out_skb;
if (err < 0)
goto out_skb;
@@
-191,7
+191,7
@@
static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
copied = len;
}
copied = len;
}
- err = skb_copy_datagram_
iovec(skb, 0, msg->msg_iov
, copied);
+ err = skb_copy_datagram_
msg(skb, 0, msg
, copied);
if (err)
goto done;
if (err)
goto done;
@@
-221,7
+221,6
@@
static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
return NET_RX_SUCCESS;
}
return NET_RX_SUCCESS;
}
-
void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb)
{
struct sock *sk;
void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb)
{
struct sock *sk;