Merge branch 'l2tp-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Dec 2017 17:11:52 +0000 (12:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Dec 2017 17:11:52 +0000 (12:11 -0500)
commit81487bf1f6a8a3e01eafb54937b1a646afe14ec5
treeb0ce5e53ca229d324ba653f64b9cc4ac34dd8e4b
parent9f30e5c5c2a4a2cbd438eadf083ca16d9a7fdc7a
parentf15bc54eeecd86dfba3885aab839cd1f45172a38
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>