diff options
author | stephen hemminger <stephen@networkplumber.org> | 2015-09-24 00:33:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-25 15:27:22 -0400 |
commit | 163c2e252fa658ac26edda78d2a9e3939f7d10e5 (patch) | |
tree | abe9cb2fcdd4b7286c43f3425676ea00ac4556d3 /net/l2tp | |
parent | f1f39f91102733bcde2462c6a138f636ee541ea8 (diff) |
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/l2tp')
-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"); | |||
655 | * enums | 655 | * enums |
656 | */ | 656 | */ |
657 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); | 657 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); |
658 | 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"); | |||
801 | * enums | 801 | * enums |
802 | */ | 802 | */ |
803 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP); | 803 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP); |
804 | MODULE_ALIAS_NET_PF_PROTO(PF_INET6, IPPROTO_L2TP); | ||