Commit ec1b4cf7 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

net: mark net_proto_ops as const

All usages of structure net_proto_ops should be declared const.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7734fdf
......@@ -808,8 +808,7 @@ mISDN_sock_create(struct net *net, struct socket *sock, int proto)
return err;
}
static struct
net_proto_family mISDN_sock_family_ops = {
static const struct net_proto_family mISDN_sock_family_ops = {
.owner = THIS_MODULE,
.family = PF_ISDN,
.create = mISDN_sock_create,
......
......@@ -125,7 +125,7 @@ out:
return rc;
}
static struct net_proto_family pppox_proto_family = {
static const struct net_proto_family pppox_proto_family = {
.family = PF_PPPOX,
.create = pppox_create,
.owner = THIS_MODULE,
......
......@@ -121,7 +121,7 @@ struct bt_sock_list {
rwlock_t lock;
};
int bt_sock_register(int proto, struct net_proto_family *ops);
int bt_sock_register(int proto, const struct net_proto_family *ops);
int bt_sock_unregister(int proto);
void bt_sock_link(struct bt_sock_list *l, struct sock *s);
void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
......
......@@ -1821,7 +1821,7 @@ static int atalk_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned lo
#endif
static struct net_proto_family atalk_family_ops = {
static const struct net_proto_family atalk_family_ops = {
.family = PF_APPLETALK,
.create = atalk_create,
.owner = THIS_MODULE,
......
......@@ -137,7 +137,7 @@ static int pvc_create(struct net *net, struct socket *sock,int protocol)
}
static struct net_proto_family pvc_family_ops = {
static const struct net_proto_family pvc_family_ops = {
.family = PF_ATMPVC,
.create = pvc_create,
.owner = THIS_MODULE,
......
......@@ -666,7 +666,7 @@ static int svc_create(struct net *net, struct socket *sock,int protocol)
}
static struct net_proto_family svc_family_ops = {
static const struct net_proto_family svc_family_ops = {
.family = PF_ATMSVC,
.create = svc_create,
.owner = THIS_MODULE,
......
......@@ -1961,7 +1961,7 @@ static const struct file_operations ax25_info_fops = {
#endif
static struct net_proto_family ax25_family_ops = {
static const struct net_proto_family ax25_family_ops = {
.family = PF_AX25,
.create = ax25_create,
.owner = THIS_MODULE,
......
......@@ -45,7 +45,7 @@
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
static struct net_proto_family *bt_proto[BT_MAX_PROTO];
static const struct net_proto_family *bt_proto[BT_MAX_PROTO];
static DEFINE_RWLOCK(bt_proto_lock);
static 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)
bt_key_strings[proto], &bt_lock_key[proto]);
}
int bt_sock_register(int proto, struct net_proto_family *ops)
int bt_sock_register(int proto, const struct net_proto_family *ops)
{
int err = 0;
......
......@@ -222,7 +222,7 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol)
return 0;
}
static struct net_proto_family bnep_sock_family_ops = {
static const struct net_proto_family bnep_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = bnep_sock_create
......
......@@ -217,7 +217,7 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol)
return 0;
}
static struct net_proto_family cmtp_sock_family_ops = {
static const struct net_proto_family cmtp_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = cmtp_sock_create
......
......@@ -687,7 +687,7 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,
return NOTIFY_DONE;
}
static struct net_proto_family hci_sock_family_ops = {
static const struct net_proto_family hci_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = hci_sock_create,
......
......@@ -268,7 +268,7 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol)
return 0;
}
static struct net_proto_family hidp_sock_family_ops = {
static const struct net_proto_family hidp_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = hidp_sock_create
......
......@@ -3916,7 +3916,7 @@ static const struct proto_ops l2cap_sock_ops = {
.getsockopt = l2cap_sock_getsockopt
};
static struct net_proto_family l2cap_sock_family_ops = {
static const struct net_proto_family l2cap_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = l2cap_sock_create,
......
......@@ -1101,7 +1101,7 @@ static const struct proto_ops rfcomm_sock_ops = {
.mmap = sock_no_mmap
};
static struct net_proto_family rfcomm_sock_family_ops = {
static const struct net_proto_family rfcomm_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = rfcomm_sock_create
......
......@@ -993,7 +993,7 @@ static const struct proto_ops sco_sock_ops = {
.getsockopt = sco_sock_getsockopt
};
static struct net_proto_family sco_sock_family_ops = {
static const struct net_proto_family sco_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = sco_sock_create,
......
......@@ -842,7 +842,7 @@ static struct packet_type can_packet __read_mostly = {
.func = can_rcv,
};
static struct net_proto_family can_family_ops __read_mostly = {
static const struct net_proto_family can_family_ops = {
.family = PF_CAN,
.create = can_create,
.owner = THIS_MODULE,
......
......@@ -2325,7 +2325,7 @@ static const struct file_operations dn_socket_seq_fops = {
};
#endif
static struct net_proto_family dn_family_ops = {
static const struct net_proto_family dn_family_ops = {
.family = AF_DECnet,
.create = dn_create,
.owner = THIS_MODULE,
......
......@@ -742,7 +742,7 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
return 0;
}
static struct net_proto_family econet_family_ops = {
static const struct net_proto_family econet_family_ops = {
.family = PF_ECONET,
.create = econet_create,
.owner = THIS_MODULE,
......
......@@ -285,7 +285,7 @@ out:
return rc;
}
static struct net_proto_family ieee802154_family_ops = {
static const struct net_proto_family ieee802154_family_ops = {
.family = PF_IEEE802154,
.create = ieee802154_create,
.owner = THIS_MODULE,
......
......@@ -931,7 +931,7 @@ static const struct proto_ops inet_sockraw_ops = {
#endif
};
static struct net_proto_family inet_family_ops = {
static const struct net_proto_family inet_family_ops = {
.family = PF_INET,
.create = inet_create,
.owner = THIS_MODULE,
......
......@@ -552,7 +552,7 @@ const struct proto_ops inet6_dgram_ops = {
#endif
};
static struct net_proto_family inet6_family_ops = {
static const struct net_proto_family inet6_family_ops = {
.family = PF_INET6,
.create = inet6_create,
.owner = THIS_MODULE,
......
......@@ -1927,7 +1927,7 @@ static int ipx_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long
* Socket family declarations
*/
static struct net_proto_family ipx_family_ops = {
static const struct net_proto_family ipx_family_ops = {
.family = PF_IPX,
.create = ipx_create,
.owner = THIS_MODULE,
......
......@@ -2463,7 +2463,7 @@ bed:
return 0;
}
static struct net_proto_family irda_family_ops = {
static const struct net_proto_family irda_family_ops = {
.family = PF_IRDA,
.create = irda_create,
.owner = THIS_MODULE,
......
......@@ -1715,7 +1715,7 @@ static const struct proto_ops iucv_sock_ops = {
.getsockopt = iucv_sock_getsockopt,
};
static struct net_proto_family iucv_sock_family_ops = {
static const struct net_proto_family iucv_sock_family_ops = {
.family = AF_IUCV,
.owner = THIS_MODULE,
.create = iucv_sock_create,
......
......@@ -3644,7 +3644,7 @@ static const struct proto_ops pfkey_ops = {
.recvmsg = pfkey_recvmsg,
};
static struct net_proto_family pfkey_family_ops = {
static const struct net_proto_family pfkey_family_ops = {
.family = PF_KEY,
.create = pfkey_create,
.owner = THIS_MODULE,
......
......@@ -1092,7 +1092,7 @@ out:
return rc;
}
static struct net_proto_family llc_ui_family_ops = {
static const struct net_proto_family llc_ui_family_ops = {
.family = PF_LLC,
.create = llc_ui_create,
.owner = THIS_MODULE,
......
......@@ -2050,7 +2050,7 @@ static const struct proto_ops netlink_ops = {
.sendpage = sock_no_sendpage,
};
static struct net_proto_family netlink_family_ops = {
static const struct net_proto_family netlink_family_ops = {
.family = PF_NETLINK,
.create = netlink_create,
.owner = THIS_MODULE, /* for consistency 8) */
......
......@@ -1372,7 +1372,7 @@ static const struct file_operations nr_info_fops = {
};
#endif /* CONFIG_PROC_FS */
static struct net_proto_family nr_family_ops = {
static const struct net_proto_family nr_family_ops = {
.family = PF_NETROM,
.create = nr_create,
.owner = THIS_MODULE,
......
......@@ -2399,7 +2399,7 @@ static const struct proto_ops packet_ops = {
.sendpage = sock_no_sendpage,
};
static struct net_proto_family packet_family_ops = {
static const struct net_proto_family packet_family_ops = {
.family = PF_PACKET,
.create = packet_create,
.owner = THIS_MODULE,
......
......@@ -118,7 +118,7 @@ out:
return err;
}
static struct net_proto_family phonet_proto_family = {
static const struct net_proto_family phonet_proto_family = {
.family = PF_PHONET,
.create = pn_socket_create,
.owner = THIS_MODULE,
......
......@@ -431,7 +431,7 @@ void rds_sock_put(struct rds_sock *rs)
sock_put(rds_rs_to_sk(rs));
}
static struct net_proto_family rds_family_ops = {
static const struct net_proto_family rds_family_ops = {
.family = AF_RDS,
.create = rds_create,
.owner = THIS_MODULE,
......
......@@ -1509,7 +1509,7 @@ static const struct file_operations rose_info_fops = {
};
#endif /* CONFIG_PROC_FS */
static struct net_proto_family rose_family_ops = {
static const struct net_proto_family rose_family_ops = {
.family = PF_ROSE,
.create = rose_create,
.owner = THIS_MODULE,
......
......@@ -777,7 +777,7 @@ static struct proto rxrpc_proto = {
.max_header = sizeof(struct rxrpc_header),
};
static struct net_proto_family rxrpc_family_ops = {
static const struct net_proto_family rxrpc_family_ops = {
.family = PF_RXRPC,
.create = rxrpc_create,
.owner = THIS_MODULE,
......
......@@ -2214,7 +2214,7 @@ static const struct file_operations unix_seq_fops = {
#endif
static struct net_proto_family unix_family_ops = {
static const struct net_proto_family unix_family_ops = {
.family = PF_UNIX,
.create = unix_create,
.owner = THIS_MODULE,
......
......@@ -1476,7 +1476,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return rc;
}
static struct net_proto_family x25_family_ops = {
static const struct net_proto_family x25_family_ops = {
.family = AF_X25,
.create = x25_create,
.owner = THIS_MODULE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment