diff options
| author |   stephen hemminger <stephen@networkplumber.org> | 2015-09-23 21:33:34 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-25 12:27:22 -0700 |
| commit | f1f39f91102733bcde2462c6a138f636ee541ea8 (patch) | |
| tree | 5b5acaad2c0b996f0fa516f65b1c43c80da0cce7 /net/l2tp/l2tp_netlink.c | |
| parent | net: dsa: Set a "dsa" device_type (diff) | |
| download | linux-dev-f1f39f91102733bcde2462c6a138f636ee541ea8.tar.xz linux-dev-f1f39f91102733bcde2462c6a138f636ee541ea8.zip | |
l2tp: auto load type modules
It should not be necessary to do explicit module loading when
configuring L2TP. Modules should be loaded as needed instead
(as is done already with netlink and other tunnel types).
This patch adds a new module alias type and code to load
the sub module on demand.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_netlink.c')
| -rw-r--r-- | net/l2tp/l2tp_netlink.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 9e13c2ff8789..f93c5be612a7 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -576,6 +576,13 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf if (info->attrs[L2TP_ATTR_MRU]) cfg.mru = nla_get_u16(info->attrs[L2TP_ATTR_MRU]); +#ifdef CONFIG_MODULES + if (l2tp_nl_cmd_ops[cfg.pw_type] == NULL) { + genl_unlock(); + request_module("net-l2tp-type-%u", cfg.pw_type); + genl_lock(); + } +#endif if ((l2tp_nl_cmd_ops[cfg.pw_type] == NULL) || (l2tp_nl_cmd_ops[cfg.pw_type]->session_create == NULL)) { ret = -EPROTONOSUPPORT; |