diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2015-09-24 06:33:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-25 21:27:22 +0200 |
| commit | 163c2e252fa658ac26edda78d2a9e3939f7d10e5 (patch) | |
| tree | abe9cb2fcdd4b7286c43f3425676ea00ac4556d3 /net | |
| parent | l2tp: auto load type modules (diff) | |
| download | linux-163c2e252fa658ac26edda78d2a9e3939f7d10e5.tar.xz linux-163c2e252fa658ac26edda78d2a9e3939f7d10e5.zip | |
l2tp: auto load IP modules
When creating a IP encapsulated tunnel the necessary l2tp module
should be loaded. It already works for UDP encapsulation, it just
doesn't work for direct IP encap.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 1 | ||||
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 79649937ec71..ec22078b0914 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -655,3 +655,4 @@ MODULE_VERSION("1.0"); * enums */ MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); +MODULE_ALIAS_NET_PF_PROTO(PF_INET, IPPROTO_L2TP); diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index d1ded3777815..aca38d8aed8e 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -801,3 +801,4 @@ MODULE_VERSION("1.0"); * enums */ MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP); +MODULE_ALIAS_NET_PF_PROTO(PF_INET6, IPPROTO_L2TP); |