5 files changed, 7 insertions, 12 deletions

diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index b6ffe4e1b84a..f99cfce7ca97 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -375,7 +375,6 @@ protocol_error:
  */
 static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
 {
-        struct rxrpc_skb_priv *sp;
         unsigned long _skb;
         int tail = call->acks_tail, old_tail;
         int win = CIRC_CNT(call->acks_head, tail, call->acks_winsz);
@@ -387,7 +386,6 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
         while (call->acks_hard < hard) {
                 smp_read_barrier_depends();
                 _skb = call->acks_window[tail] & ~1;
-                sp = rxrpc_skb((struct sk_buff *) _skb);
                 rxrpc_free_skb((struct sk_buff *) _skb);
                 old_tail = tail;
                 tail = (tail + 1) & (call->acks_winsz - 1);
diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
index 0505cdc4d6d4..e7ed43a54c41 100644
--- a/net/rxrpc/ar-connevent.c
+++ b/net/rxrpc/ar-connevent.c
@@ -259,7 +259,6 @@ void rxrpc_process_connection(struct work_struct *work)
 {
         struct rxrpc_connection *conn =
                 container_of(work, struct rxrpc_connection, processor);
-        struct rxrpc_skb_priv *sp;
         struct sk_buff *skb;
         u32 abort_code = RX_PROTOCOL_ERROR;
         int ret;
@@ -276,8 +275,6 @@ void rxrpc_process_connection(struct work_struct *work)
         /* go through the conn-level event packets, releasing the ref on this
          * connection that each one has when we've finished with it */
         while ((skb = skb_dequeue(&conn->rx_queue))) {
-                sp = rxrpc_skb(skb);
-
                 ret = rxrpc_process_event(conn, skb, &abort_code);
                 switch (ret) {
                 case -EPROTO:
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index d4d1ae26d293..5d6b572a6704 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -139,7 +139,7 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
         struct rxrpc_transport *trans =
                 container_of(work, struct rxrpc_transport, error_handler);
         struct sk_buff *skb;
-        int local, err;
+        int err;
 
         _enter("");
 
@@ -157,7 +157,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
 
         switch (ee->ee_origin) {
         case SO_EE_ORIGIN_ICMP:
-                local = 0;
                 switch (ee->ee_type) {
                 case ICMP_DEST_UNREACH:
                         switch (ee->ee_code) {
@@ -207,7 +206,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
         case SO_EE_ORIGIN_LOCAL:
                 _proto("Rx Received local error { error=%d }",
                        ee->ee_errno);
-                local = 1;
                 break;
 
         case SO_EE_ORIGIN_NONE:
@@ -215,7 +213,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
         default:
                 _proto("Rx Received error report { orig=%u }",
                        ee->ee_origin);
-                local = 0;
                 break;
         }
 
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
index 55b93dc60d0c..2754f098d436 100644
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -36,10 +36,11 @@ static void rxrpc_destroy_peer(struct work_struct *work);
 static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
 {
         struct rtable *rt;
+        struct flowi4 fl4;
 
         peer->if_mtu = 1500;
 
-        rt = ip_route_output_ports(&init_net, NULL,
+        rt = ip_route_output_ports(&init_net, &fl4, NULL,
                                    peer->srx.transport.sin.sin_addr.s_addr, 0,
                                    htons(7000), htons(7001),
                                    IPPROTO_UDP, 0, 0);
@@ -156,6 +157,7 @@ struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
         /* we can now add the new candidate to the list */
         peer = candidate;
         candidate = NULL;
+        usage = atomic_read(&peer->usage);
 
         list_add_tail(&peer->link, &rxrpc_peers);
         write_unlock_bh(&rxrpc_peer_lock);
@@ -170,7 +172,7 @@ success:
              &peer->srx.transport.sin.sin_addr,
              ntohs(peer->srx.transport.sin.sin_port));
 
-        _leave(" = %p {u=%d}", peer, atomic_read(&peer->usage));
+        _leave(" = %p {u=%d}", peer, usage);
         return peer;
 
         /* we found the peer in the list immediately */
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
index 5e0226fe587e..92df566930b9 100644
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
@@ -111,6 +111,7 @@ struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *local,
         /* we can now add the new candidate to the list */
         trans = candidate;
         candidate = NULL;
+        usage = atomic_read(&trans->usage);
 
         rxrpc_get_local(trans->local);
         atomic_inc(&trans->peer->usage);
@@ -125,7 +126,7 @@ success:
              trans->local->debug_id,
              trans->peer->debug_id);
 
-        _leave(" = %p {u=%d}", trans, atomic_read(&trans->usage));
+        _leave(" = %p {u=%d}", trans, usage);
         return trans;
 
         /* we found the transport in the list immediately */