Commit 5a790b73 authored by David Howells's avatar David Howells

rxrpc: Drop the local endpoint arg from rxrpc_extract_addr_from_skb()

rxrpc_extract_addr_from_skb() doesn't use the argument that points to the
local endpoint, so remove the argument.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 46894a13
...@@ -1111,8 +1111,7 @@ static inline void rxrpc_sysctl_exit(void) {} ...@@ -1111,8 +1111,7 @@ static inline void rxrpc_sysctl_exit(void) {}
/* /*
* utils.c * utils.c
*/ */
int rxrpc_extract_addr_from_skb(struct rxrpc_local *, struct sockaddr_rxrpc *, int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *, struct sk_buff *);
struct sk_buff *);
static inline bool before(u32 seq1, u32 seq2) static inline bool before(u32 seq1, u32 seq2)
{ {
......
...@@ -280,7 +280,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx, ...@@ -280,7 +280,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx,
peer = NULL; peer = NULL;
if (!peer) { if (!peer) {
peer = b->peer_backlog[peer_tail]; peer = b->peer_backlog[peer_tail];
if (rxrpc_extract_addr_from_skb(local, &peer->srx, skb) < 0) if (rxrpc_extract_addr_from_skb(&peer->srx, skb) < 0)
return NULL; return NULL;
b->peer_backlog[peer_tail] = NULL; b->peer_backlog[peer_tail] = NULL;
smp_store_release(&b->peer_backlog_tail, smp_store_release(&b->peer_backlog_tail,
......
...@@ -86,7 +86,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local, ...@@ -86,7 +86,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local,
_enter(",%x", sp->hdr.cid & RXRPC_CIDMASK); _enter(",%x", sp->hdr.cid & RXRPC_CIDMASK);
if (rxrpc_extract_addr_from_skb(local, &srx, skb) < 0) if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)
goto not_found; goto not_found;
if (srx.transport.family != local->srx.transport.family && if (srx.transport.family != local->srx.transport.family &&
......
...@@ -39,7 +39,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, ...@@ -39,7 +39,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local,
_enter(""); _enter("");
if (rxrpc_extract_addr_from_skb(local, &srx, skb) < 0) if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)
return; return;
msg.msg_name = &srx.transport; msg.msg_name = &srx.transport;
......
...@@ -561,7 +561,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local) ...@@ -561,7 +561,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
continue; continue;
} }
if (rxrpc_extract_addr_from_skb(local, &srx, skb) == 0) { if (rxrpc_extract_addr_from_skb(&srx, skb) == 0) {
msg.msg_namelen = srx.transport_len; msg.msg_namelen = srx.transport_len;
whdr.epoch = htonl(sp->hdr.epoch); whdr.epoch = htonl(sp->hdr.epoch);
......
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
/* /*
* Fill out a peer address from a socket buffer containing a packet. * Fill out a peer address from a socket buffer containing a packet.
*/ */
int rxrpc_extract_addr_from_skb(struct rxrpc_local *local, int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *srx, struct sk_buff *skb)
struct sockaddr_rxrpc *srx,
struct sk_buff *skb)
{ {
memset(srx, 0, sizeof(*srx)); memset(srx, 0, sizeof(*srx));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment