From: David S. Miller Date: Sat, 11 Aug 2018 19:13:49 +0000 (-0700) Subject: Merge branch 'l2tp-rework-pppol2tp-ioctl-handling' X-Git-Tag: for-linus-20180825~89^2~44 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3305f9a90524c8e9e59f29a62312c10ab00a7364;p=linux-block.git Merge branch 'l2tp-rework-pppol2tp-ioctl-handling' Guillaume Nault says: ==================== l2tp: rework pppol2tp ioctl handling The current ioctl() handling code can be simplified. It tests for non-relevant conditions and uselessly holds sockets. Once useless code is removed, it becomes even simpler to let pppol2tp_ioctl() handle commands directly, rather than dispatch them to pppol2tp_tunnel_ioctl() or pppol2tp_session_ioctl(). That is the approach taken by this series. Patch #1 and #2 define helper functions aimed at simplifying the rest of the patch set. Patch #3 drops useless tests in pppol2p_ioctl() and avoid holding a refcount on the socket. Patches #4, #5 and #6 are the core of the series. They let pppol2tp_ioctl() handle all ioctls and drop the tunnel and session specific functions. Then patch #6 brings a little bit of consolidation. Finally, patch #7 takes advantage of the simplified code to make pppol2tp sockets compatible with dev_ioctl(). Certainly not a killer feature, but it is trivial and it is always nice to see l2tp getting better integration with the rest of the stack. ==================== Signed-off-by: David S. Miller --- 3305f9a90524c8e9e59f29a62312c10ab00a7364