Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
562640f3
Commit
562640f3
authored
Nov 15, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tipc_sendmsg(): pass msghdr instead of its ->msg_iov
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
e0eb093e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
net/tipc/socket.c
net/tipc/socket.c
+4
-4
No files found.
net/tipc/socket.c
View file @
562640f3
...
@@ -700,7 +700,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock,
...
@@ -700,7 +700,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock,
* tipc_sendmcast - send multicast message
* tipc_sendmcast - send multicast message
* @sock: socket structure
* @sock: socket structure
* @seq: destination address
* @seq: destination address
* @
iov: message data
to send
* @
msg: message
to send
* @dsz: total length of message data
* @dsz: total length of message data
* @timeo: timeout to wait for wakeup
* @timeo: timeout to wait for wakeup
*
*
...
@@ -708,7 +708,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock,
...
@@ -708,7 +708,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock,
* Returns the number of bytes sent on success, or errno
* Returns the number of bytes sent on success, or errno
*/
*/
static
int
tipc_sendmcast
(
struct
socket
*
sock
,
struct
tipc_name_seq
*
seq
,
static
int
tipc_sendmcast
(
struct
socket
*
sock
,
struct
tipc_name_seq
*
seq
,
struct
iovec
*
iov
,
size_t
dsz
,
long
timeo
)
struct
msghdr
*
msg
,
size_t
dsz
,
long
timeo
)
{
{
struct
sock
*
sk
=
sock
->
sk
;
struct
sock
*
sk
=
sock
->
sk
;
struct
tipc_msg
*
mhdr
=
&
tipc_sk
(
sk
)
->
phdr
;
struct
tipc_msg
*
mhdr
=
&
tipc_sk
(
sk
)
->
phdr
;
...
@@ -727,7 +727,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq,
...
@@ -727,7 +727,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_name_seq *seq,
new_mtu:
new_mtu:
mtu
=
tipc_bclink_get_mtu
();
mtu
=
tipc_bclink_get_mtu
();
rc
=
tipc_msg_build
(
mhdr
,
iov
,
0
,
dsz
,
mtu
,
&
buf
);
rc
=
tipc_msg_build
(
mhdr
,
msg
->
msg_
iov
,
0
,
dsz
,
mtu
,
&
buf
);
if
(
unlikely
(
rc
<
0
))
if
(
unlikely
(
rc
<
0
))
return
rc
;
return
rc
;
...
@@ -951,7 +951,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock,
...
@@ -951,7 +951,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock,
timeo
=
sock_sndtimeo
(
sk
,
m
->
msg_flags
&
MSG_DONTWAIT
);
timeo
=
sock_sndtimeo
(
sk
,
m
->
msg_flags
&
MSG_DONTWAIT
);
if
(
dest
->
addrtype
==
TIPC_ADDR_MCAST
)
{
if
(
dest
->
addrtype
==
TIPC_ADDR_MCAST
)
{
rc
=
tipc_sendmcast
(
sock
,
seq
,
iov
,
dsz
,
timeo
);
rc
=
tipc_sendmcast
(
sock
,
seq
,
m
,
dsz
,
timeo
);
goto
exit
;
goto
exit
;
}
else
if
(
dest
->
addrtype
==
TIPC_ADDR_NAME
)
{
}
else
if
(
dest
->
addrtype
==
TIPC_ADDR_NAME
)
{
u32
type
=
dest
->
addr
.
name
.
name
.
type
;
u32
type
=
dest
->
addr
.
name
.
name
.
type
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment