diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
| commit | f16180739cd18a39a1a45516ac0e65d18a9f100e (patch) | |
| tree | 22d1135650f8ddb25707c788cd4846c77b428ff0 /net/rxrpc/peer_event.c | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| parent | e1e54ec7fb55501c33b117c111cb0a045b8eded2 (diff) | |
| download | kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.gz kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.bz2 kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.zip | |
Merge remote-tracking branch 'net/master' into afs-next
Diffstat (limited to 'net/rxrpc/peer_event.c')
| -rw-r--r-- | net/rxrpc/peer_event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c index 7666ec72d37e..c97ebdc043e4 100644 --- a/net/rxrpc/peer_event.c +++ b/net/rxrpc/peer_event.c @@ -163,11 +163,11 @@ void rxrpc_error_report(struct sock *sk) _leave("UDP socket errqueue empty"); return; } - rxrpc_new_skb(skb, rxrpc_skb_rx_received); + rxrpc_new_skb(skb, rxrpc_skb_received); serr = SKB_EXT_ERR(skb); if (!skb->len && serr->ee.ee_origin == SO_EE_ORIGIN_TIMESTAMPING) { _leave("UDP empty message"); - rxrpc_free_skb(skb, rxrpc_skb_rx_freed); + rxrpc_free_skb(skb, rxrpc_skb_freed); return; } @@ -177,7 +177,7 @@ void rxrpc_error_report(struct sock *sk) peer = NULL; if (!peer) { rcu_read_unlock(); - rxrpc_free_skb(skb, rxrpc_skb_rx_freed); + rxrpc_free_skb(skb, rxrpc_skb_freed); _leave(" [no peer]"); return; } @@ -189,7 +189,7 @@ void rxrpc_error_report(struct sock *sk) serr->ee.ee_code == ICMP_FRAG_NEEDED)) { rxrpc_adjust_mtu(peer, serr); rcu_read_unlock(); - rxrpc_free_skb(skb, rxrpc_skb_rx_freed); + rxrpc_free_skb(skb, rxrpc_skb_freed); rxrpc_put_peer(peer); _leave(" [MTU update]"); return; @@ -197,7 +197,7 @@ void rxrpc_error_report(struct sock *sk) rxrpc_store_error(peer, serr); rcu_read_unlock(); - rxrpc_free_skb(skb, rxrpc_skb_rx_freed); + rxrpc_free_skb(skb, rxrpc_skb_freed); rxrpc_put_peer(peer); _leave(""); |