o bluetooth: use revised net module infrastructure

Using THIS_MODULE in the struct proto_ops registered with the core.

diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 91310913ca78f1bb6a0b866a4edac9079a9db5fe..60d22f5e582006b3ee80c3157c5352f479397ccb 100644 (file)
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -148,6 +148,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
 static struct proto_ops bnep_sock_ops = {
        .family     = PF_BLUETOOTH,
+       .owner      = THIS_MODULE,
        .release    = bnep_sock_release,
        .ioctl      = bnep_sock_ioctl,
        .bind       = sock_no_bind,

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 952f6de9d8b5c57a6e53a6bfd3a88f449a38c10d..61429363982c15723b3dce8c5188a05b30ccb573 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -553,6 +553,7 @@ int hci_sock_getsockopt(struct socket *sock, int level, int optname, char *optva
 
 struct proto_ops hci_sock_ops = {
        .family =       PF_BLUETOOTH,
+       .owner =        THIS_MODULE,
        .release =      hci_sock_release,
        .bind =         hci_sock_bind,
        .getname =      hci_sock_getname,

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index dff6a585c10ab8456496d5bdc1ba9ed807b8df63..fe811355a735e45246afbe689edb14e53398fb64 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2084,6 +2084,7 @@ static void __exit l2cap_proc_cleanup(void)
 
 static struct proto_ops l2cap_sock_ops = {
        .family  =      PF_BLUETOOTH,
+       .owner   =      THIS_MODULE,
        .release =      l2cap_sock_release,
        .bind    =      l2cap_sock_bind,
        .connect =      l2cap_sock_connect,
@@ -2104,6 +2105,7 @@ static struct proto_ops l2cap_sock_ops = {
 static struct net_proto_family l2cap_sock_family_ops = {
        .family =       PF_BLUETOOTH,
        .create =       l2cap_sock_create,
+       .owner  =       THIS_MODULE,
 };
 
 static struct hci_proto l2cap_hci_proto = {

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index c85e4e16bae142c6a36a982ebe17fa27980c09cd..81bdda3ce9bd65f82864c9ea1e2aa908b75d1de7 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -856,6 +856,7 @@ static void __exit rfcomm_sock_proc_cleanup(void)
 
 static struct proto_ops rfcomm_sock_ops = {
        .family         = PF_BLUETOOTH,
+       .owner          = THIS_MODULE,
        .release        = rfcomm_sock_release,
        .bind           = rfcomm_sock_bind,
        .connect        = rfcomm_sock_connect,

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index de427d58993e92f39ef26cab7d7bdbc18506f1e5..02ac269362f14810d406e40f351f69697c8e67cc 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -969,6 +969,7 @@ static void __exit sco_proc_cleanup(void)
 
 static struct proto_ops sco_sock_ops = {
        .family  =      PF_BLUETOOTH,
+       .owner   =      THIS_MODULE,
        .release =      sco_sock_release,
        .bind    =      sco_sock_bind,
        .connect =      sco_sock_connect,
@@ -989,6 +990,7 @@ static struct proto_ops sco_sock_ops = {
 static struct net_proto_family sco_sock_family_ops = {
        .family =       PF_BLUETOOTH,
        .create =       sco_sock_create,
+       .owner  =       THIS_MODULE,
 };
 
 static struct hci_proto sco_hci_proto = {