From: David S. Miller <davem@davemloft.net>
Date: Wed, 27 Dec 2017 17:11:52 +0000 (-0500)
Subject: Merge branch 'l2tp-next'
X-Git-Tag: v4.16-rc1~123^2~285
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=81487bf1f6a8a3e01eafb54937b1a646afe14ec5;p=linux.git

Merge branch 'l2tp-next'

Lorenzo Bianconi says:

====================
l2tp: fix offset/peer_offset conf parameters

This patchset add peer_offset configuration parameter in order to
specify two different values for payload offset on tx/rx side.
Moreover fix missing print session offset info
====================

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

81487bf1f6a8a3e01eafb54937b1a646afe14ec5