diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-22 06:00:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-22 06:00:28 +0300 |
| commit | 417b7ca44427ab8ddaa65eece094edf5e1404586 (patch) | |
| tree | 93ade52b643d16a04d808dc2547f62ea65f82110 /include | |
| parent | e817af27e01f9294055a441d1034bbc353ee39d2 (diff) | |
| parent | 84a8cbe46af0945859a8f61bce6100ddc3d51a51 (diff) | |
| download | linux-417b7ca44427ab8ddaa65eece094edf5e1404586.tar.xz | |
Merge branch 'lwt-autoload'
Robert Shearman says:
====================
lwtunnel: autoload of lwt modules
Changes since v1:
- remove "LWTUNNEL_ENCAP_" prefix for the string form of the encaps
used when requesting the module to reduce duplication, and don't
bother returning strings for lwt modules using netdevices, both
suggested by Jiri.
- update commit message of first patch to clarify security
implications, in response to Eric's comments.
The lwt implementations using net devices can autoload using the
existing mechanism using IFLA_INFO_KIND. However, there's no mechanism
that lwt modules not using net devices can use.
Therefore, these patches add the ability to autoload modules
registering lwt operations for lwt implementations not using a net
device so that users don't have to manually load the modules.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/lwtunnel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h index 66350ce3e955..e9f116e29c22 100644 --- a/include/net/lwtunnel.h +++ b/include/net/lwtunnel.h @@ -170,6 +170,8 @@ static inline int lwtunnel_input(struct sk_buff *skb) return -EOPNOTSUPP; } -#endif +#endif /* CONFIG_LWTUNNEL */ + +#define MODULE_ALIAS_RTNL_LWT(encap_type) MODULE_ALIAS("rtnl-lwt-" __stringify(encap_type)) #endif /* __NET_LWTUNNEL_H */ |