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
nexedi
linux
Commits
e1693718
Commit
e1693718
authored
Apr 06, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch ipxrtr_route_packet() from iovec to msghdr
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
6ce8e9ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
include/net/ipx.h
include/net/ipx.h
+1
-1
net/ipx/af_ipx.c
net/ipx/af_ipx.c
+1
-2
net/ipx/ipx_route.c
net/ipx/ipx_route.c
+2
-2
No files found.
include/net/ipx.h
View file @
e1693718
...
@@ -150,7 +150,7 @@ int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc,
...
@@ -150,7 +150,7 @@ int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc,
unsigned
char
*
node
);
unsigned
char
*
node
);
void
ipxrtr_del_routes
(
struct
ipx_interface
*
intrfc
);
void
ipxrtr_del_routes
(
struct
ipx_interface
*
intrfc
);
int
ipxrtr_route_packet
(
struct
sock
*
sk
,
struct
sockaddr_ipx
*
usipx
,
int
ipxrtr_route_packet
(
struct
sock
*
sk
,
struct
sockaddr_ipx
*
usipx
,
struct
iovec
*
iov
,
size_t
len
,
int
noblock
);
struct
msghdr
*
msg
,
size_t
len
,
int
noblock
);
int
ipxrtr_route_skb
(
struct
sk_buff
*
skb
);
int
ipxrtr_route_skb
(
struct
sk_buff
*
skb
);
struct
ipx_route
*
ipxrtr_lookup
(
__be32
net
);
struct
ipx_route
*
ipxrtr_lookup
(
__be32
net
);
int
ipxrtr_ioctl
(
unsigned
int
cmd
,
void
__user
*
arg
);
int
ipxrtr_ioctl
(
unsigned
int
cmd
,
void
__user
*
arg
);
...
...
net/ipx/af_ipx.c
View file @
e1693718
...
@@ -1745,8 +1745,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
...
@@ -1745,8 +1745,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
memcpy
(
usipx
->
sipx_node
,
ipxs
->
dest_addr
.
node
,
IPX_NODE_LEN
);
memcpy
(
usipx
->
sipx_node
,
ipxs
->
dest_addr
.
node
,
IPX_NODE_LEN
);
}
}
rc
=
ipxrtr_route_packet
(
sk
,
usipx
,
msg
->
msg_iov
,
len
,
rc
=
ipxrtr_route_packet
(
sk
,
usipx
,
msg
,
len
,
flags
&
MSG_DONTWAIT
);
flags
&
MSG_DONTWAIT
);
if
(
rc
>=
0
)
if
(
rc
>=
0
)
rc
=
len
;
rc
=
len
;
out:
out:
...
...
net/ipx/ipx_route.c
View file @
e1693718
...
@@ -165,7 +165,7 @@ int ipxrtr_route_skb(struct sk_buff *skb)
...
@@ -165,7 +165,7 @@ int ipxrtr_route_skb(struct sk_buff *skb)
* Route an outgoing frame from a socket.
* Route an outgoing frame from a socket.
*/
*/
int
ipxrtr_route_packet
(
struct
sock
*
sk
,
struct
sockaddr_ipx
*
usipx
,
int
ipxrtr_route_packet
(
struct
sock
*
sk
,
struct
sockaddr_ipx
*
usipx
,
struct
iovec
*
iov
,
size_t
len
,
int
noblock
)
struct
msghdr
*
msg
,
size_t
len
,
int
noblock
)
{
{
struct
sk_buff
*
skb
;
struct
sk_buff
*
skb
;
struct
ipx_sock
*
ipxs
=
ipx_sk
(
sk
);
struct
ipx_sock
*
ipxs
=
ipx_sk
(
sk
);
...
@@ -229,7 +229,7 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
...
@@ -229,7 +229,7 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
memcpy
(
ipx
->
ipx_dest
.
node
,
usipx
->
sipx_node
,
IPX_NODE_LEN
);
memcpy
(
ipx
->
ipx_dest
.
node
,
usipx
->
sipx_node
,
IPX_NODE_LEN
);
ipx
->
ipx_dest
.
sock
=
usipx
->
sipx_port
;
ipx
->
ipx_dest
.
sock
=
usipx
->
sipx_port
;
rc
=
memcpy_from
iovec
(
skb_put
(
skb
,
len
),
iov
,
len
);
rc
=
memcpy_from
_msg
(
skb_put
(
skb
,
len
),
msg
,
len
);
if
(
rc
)
{
if
(
rc
)
{
kfree_skb
(
skb
);
kfree_skb
(
skb
);
goto
out_put
;
goto
out_put
;
...
...
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