diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 11:32:06 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 11:32:06 +0300 |
| commit | 7bddba775026d51dede9d726bd8158574c0ec5a6 (patch) | |
| tree | 6ec6b7cfd9ef9a7915bf1f4ce13cff1d3944694f /net/mpls/mpls_iptunnel.c | |
| parent | 530b7a3e216e8a73ba0e0c364dbec330113bf86c (diff) | |
| parent | d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff) | |
| download | linux-7bddba775026d51dede9d726bd8158574c0ec5a6.tar.xz | |
Merge 4.10-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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) |