diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
| commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
| tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /net/mpls/mpls_iptunnel.c | |
| parent | f28442497b5caf7bf573ade22a7f8d3559e3ef56 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mpls/mpls_iptunnel.c')
| -rw-r--r-- | net/mpls/mpls_iptunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c index 2f7ccd934416..1d281c1ff7c1 100644 --- a/net/mpls/mpls_iptunnel.c +++ b/net/mpls/mpls_iptunnel.c @@ -215,6 +215,7 @@ static const struct lwtunnel_encap_ops mpls_iptun_ops = { .fill_encap = mpls_fill_encap_info, .get_encap_size = mpls_encap_nlsize, .cmp_encap = mpls_encap_cmp, + .owner = THIS_MODULE, }; static int __init mpls_iptunnel_init(void) |