From: David S. Miller <davem@davemloft.net>
Date: Wed, 27 May 2020 21:57:27 +0000 (-0700)
Subject: Merge branch 'tcp-tcp_v4_err-cleanups'
X-Git-Tag: v5.8-rc1~165^2~82
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=be372e919c5ec8408f982ac3b7b5ac9fc63d7c40;p=users%2Fhch%2Fmisc.git

Merge branch 'tcp-tcp_v4_err-cleanups'

Eric Dumazet says:

====================
tcp: tcp_v4_err() cleanups

This series is a followup of patch 239174945dac ("tcp: tcp_v4_err() icmp
skb is named icmp_skb").

Move the RFC 6069 code into a helper, and rename icmp_skb to standard
skb name so that tcp_v4_err() and tcp_v6_err() are using consistent names.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

be372e919c5ec8408f982ac3b7b5ac9fc63d7c40