aboutsummaryrefslogtreecommitdiffstats
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:18:38 -0700
commit3b482bb76dfd1389e4406c27c1005addf1dea08b (patch)
tree73d402e03b787283ca3f5aa58720776c37489454 /net
parent52ef39eeff06aecc56266902bba6bf28891cabd3 (diff)
downloadkernel_samsung_smdk4412-3b482bb76dfd1389e4406c27c1005addf1dea08b.zip
kernel_samsung_smdk4412-3b482bb76dfd1389e4406c27c1005addf1dea08b.tar.gz
kernel_samsung_smdk4412-3b482bb76dfd1389e4406c27c1005addf1dea08b.tar.bz2
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 4613225..2366914 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1771,7 +1771,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