aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-10-05 01:58:39 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-07 04:10:46 -0400
commitec1b4cf74c81bfd0fbe5bf62bafc86c45917e72f (patch)
tree1b693e4e027f3e42224e6221ae018daeb562e5e1 /net/bluetooth
parentf7734fdf61ec6bb848e0bafc1fb8bad2c124bb50 (diff)
net: mark net_proto_ops as const
All usages of structure net_proto_ops should be declared const. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/af_bluetooth.c4
-rw-r--r--net/bluetooth/bnep/sock.c2
-rw-r--r--net/bluetooth/cmtp/sock.c2
-rw-r--r--net/bluetooth/hci_sock.c2
-rw-r--r--net/bluetooth/hidp/sock.c2
-rw-r--r--net/bluetooth/l2cap.c2
-rw-r--r--net/bluetooth/rfcomm/sock.c2
-rw-r--r--net/bluetooth/sco.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 8cfb5a849841..1f6e49c1cde8 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -45,7 +45,7 @@
45 45
46/* Bluetooth sockets */ 46/* Bluetooth sockets */
47#define BT_MAX_PROTO 8 47#define BT_MAX_PROTO 8
48static struct net_proto_family *bt_proto[BT_MAX_PROTO]; 48static const struct net_proto_family *bt_proto[BT_MAX_PROTO];
49static DEFINE_RWLOCK(bt_proto_lock); 49static DEFINE_RWLOCK(bt_proto_lock);
50 50
51static struct lock_class_key bt_lock_key[BT_MAX_PROTO]; 51static struct lock_class_key bt_lock_key[BT_MAX_PROTO];
@@ -86,7 +86,7 @@ static inline void bt_sock_reclassify_lock(struct socket *sock, int proto)
86 bt_key_strings[proto], &bt_lock_key[proto]); 86 bt_key_strings[proto], &bt_lock_key[proto]);
87} 87}
88 88
89int bt_sock_register(int proto, struct net_proto_family *ops) 89int bt_sock_register(int proto, const struct net_proto_family *ops)
90{ 90{
91 int err = 0; 91 int err = 0;
92 92
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index e857628b0b27..0a2c5460bb48 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -222,7 +222,7 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol)
222 return 0; 222 return 0;
223} 223}
224 224
225static struct net_proto_family bnep_sock_family_ops = { 225static const struct net_proto_family bnep_sock_family_ops = {
226 .family = PF_BLUETOOTH, 226 .family = PF_BLUETOOTH,
227 .owner = THIS_MODULE, 227 .owner = THIS_MODULE,
228 .create = bnep_sock_create 228 .create = bnep_sock_create
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 16b0fad74f6e..de7c8040bc56 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -217,7 +217,7 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol)
217 return 0; 217 return 0;
218} 218}
219 219
220static struct net_proto_family cmtp_sock_family_ops = { 220static const struct net_proto_family cmtp_sock_family_ops = {
221 .family = PF_BLUETOOTH, 221 .family = PF_BLUETOOTH,
222 .owner = THIS_MODULE, 222 .owner = THIS_MODULE,
223 .create = cmtp_sock_create 223 .create = cmtp_sock_create
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 75302a986067..e7395f231989 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -687,7 +687,7 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,
687 return NOTIFY_DONE; 687 return NOTIFY_DONE;
688} 688}
689 689
690static struct net_proto_family hci_sock_family_ops = { 690static const struct net_proto_family hci_sock_family_ops = {
691 .family = PF_BLUETOOTH, 691 .family = PF_BLUETOOTH,
692 .owner = THIS_MODULE, 692 .owner = THIS_MODULE,
693 .create = hci_sock_create, 693 .create = hci_sock_create,
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 37c9d7d2e688..4beb6a7a2953 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -268,7 +268,7 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol)
268 return 0; 268 return 0;
269} 269}
270 270
271static struct net_proto_family hidp_sock_family_ops = { 271static const struct net_proto_family hidp_sock_family_ops = {
272 .family = PF_BLUETOOTH, 272 .family = PF_BLUETOOTH,
273 .owner = THIS_MODULE, 273 .owner = THIS_MODULE,
274 .create = hidp_sock_create 274 .create = hidp_sock_create
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 555d9da1869b..4b66bd579f4a 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3916,7 +3916,7 @@ static const struct proto_ops l2cap_sock_ops = {
3916 .getsockopt = l2cap_sock_getsockopt 3916 .getsockopt = l2cap_sock_getsockopt
3917}; 3917};
3918 3918
3919static struct net_proto_family l2cap_sock_family_ops = { 3919static const struct net_proto_family l2cap_sock_family_ops = {
3920 .family = PF_BLUETOOTH, 3920 .family = PF_BLUETOOTH,
3921 .owner = THIS_MODULE, 3921 .owner = THIS_MODULE,
3922 .create = l2cap_sock_create, 3922 .create = l2cap_sock_create,
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 8a20aaf1f231..c70786503850 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -1101,7 +1101,7 @@ static const struct proto_ops rfcomm_sock_ops = {
1101 .mmap = sock_no_mmap 1101 .mmap = sock_no_mmap
1102}; 1102};
1103 1103
1104static struct net_proto_family rfcomm_sock_family_ops = { 1104static const struct net_proto_family rfcomm_sock_family_ops = {
1105 .family = PF_BLUETOOTH, 1105 .family = PF_BLUETOOTH,
1106 .owner = THIS_MODULE, 1106 .owner = THIS_MODULE,
1107 .create = rfcomm_sock_create 1107 .create = rfcomm_sock_create
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 77f4153bdb5e..694a65541b73 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -993,7 +993,7 @@ static const struct proto_ops sco_sock_ops = {
993 .getsockopt = sco_sock_getsockopt 993 .getsockopt = sco_sock_getsockopt
994}; 994};
995 995
996static struct net_proto_family sco_sock_family_ops = { 996static const struct net_proto_family sco_sock_family_ops = {
997 .family = PF_BLUETOOTH, 997 .family = PF_BLUETOOTH,
998 .owner = THIS_MODULE, 998 .owner = THIS_MODULE,
999 .create = sco_sock_create, 999 .create = sco_sock_create,