summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-07-02 09:02:07 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-28 16:29:49 -0700
commited7f614ab8c605aadfa163d468a980642b3929da (patch)
tree0bd3a796ece87a9758bd313a489fe056b50cae1d /net
parentedb42cad3392ba6a1cd3a688cfb7af16d6b2137f (diff)
downloadlinux-3.10-ed7f614ab8c605aadfa163d468a980642b3929da.tar.gz
linux-3.10-ed7f614ab8c605aadfa163d468a980642b3929da.tar.bz2
linux-3.10-ed7f614ab8c605aadfa163d468a980642b3929da.zip
l2tp: add missing .owner to struct pppox_proto
[ Upstream commit e1558a93b61962710733dc8c11a2bc765607f1cd ] Add missing .owner of struct pppox_proto. This prevents the module from being removed from underneath its users. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/l2tp/l2tp_ppp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 8dec6876dc5..5ebee2ded9e 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1793,7 +1793,8 @@ static const struct proto_ops pppol2tp_ops = {
static const struct pppox_proto pppol2tp_proto = {
.create = pppol2tp_create,
- .ioctl = pppol2tp_ioctl
+ .ioctl = pppol2tp_ioctl,
+ .owner = THIS_MODULE,
};
#ifdef CONFIG_L2TP_V3