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: David Howells <dhowells@redhat.com>

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 9ba87e4d15c7403053ca0328b817cdd7ebc2a487..76569c1789152db8fae921e807b9a868ee39c0f1 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -1111,8 +1111,7 @@ static inline void rxrpc_sysctl_exit(void) {}
 /*
  * utils.c
  */
-int rxrpc_extract_addr_from_skb(struct rxrpc_local *, struct sockaddr_rxrpc *,
-                               struct sk_buff *);
+int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *, struct sk_buff *);
 
 static inline bool before(u32 seq1, u32 seq2)
 {

diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index 9c7f26d06a52f36d98bc78df68e682f51f8eb9e6..8354cadbb8392e9d5ea655fe3728df4e8d4e65dc 100644 (file)
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -280,7 +280,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx,
                        peer = NULL;
                if (!peer) {
                        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;
                        b->peer_backlog[peer_tail] = NULL;
                        smp_store_release(&b->peer_backlog_tail,

diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c
index fb856a1ccda8abf3bd7b615f4f0f253e4ebe5802..c332722820c2bbcaa0d8d98464d535ffc36627d9 100644 (file)
--- a/net/rxrpc/conn_object.c
+++ b/net/rxrpc/conn_object.c
@@ -86,7 +86,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local,
 
        _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;
 
        if (srx.transport.family != local->srx.transport.family &&

diff --git a/net/rxrpc/local_event.c b/net/rxrpc/local_event.c
index 13bd8a4dfac7126effa56e4a5766634e8278e0cc..927ead43df42592f3029051f5362016f6a636f05 100644 (file)
--- a/net/rxrpc/local_event.c
+++ b/net/rxrpc/local_event.c
@@ -39,7 +39,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local,
 
        _enter("");
 
-       if (rxrpc_extract_addr_from_skb(local, &srx, skb) < 0)
+       if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)
                return;
 
        msg.msg_name    = &srx.transport;

diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 993d4cd247f9a9bdf7ac7652f151ab135fac54b9..0f0b499d12027cff4ecee7c0cd224fc71e617878 100644 (file)
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -561,7 +561,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
                        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;
 
                        whdr.epoch      = htonl(sp->hdr.epoch);

diff --git a/net/rxrpc/utils.c b/net/rxrpc/utils.c
index 017adaa54e9068f989a3b4c792a063dc5044a1b7..ff7af71c4b49815b9406061c02ad453275df026c 100644 (file)
--- a/net/rxrpc/utils.c
+++ b/net/rxrpc/utils.c
@@ -17,9 +17,7 @@
 /*
  * Fill out a peer address from a socket buffer containing a packet.
  */
-int rxrpc_extract_addr_from_skb(struct rxrpc_local *local,
-                               struct sockaddr_rxrpc *srx,
-                               struct sk_buff *skb)
+int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *srx, struct sk_buff *skb)
 {
        memset(srx, 0, sizeof(*srx));