diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-11-21 17:15:20 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2011-11-22 11:13:35 -0800 |
| commit | 850b6b3b9f8c38b42e315c2c07d232a33b82da3e (patch) | |
| tree | d871e18ffa1fcb45bb85610fe3e4d15a8ce52e2d /datapath/dp_notify.c | |
| parent | 28da1f8f725fc2a797174df18a7b3e31ef49ede0 (diff) | |
| download | openvswitch-850b6b3b9f8c38b42e315c2c07d232a33b82da3e.tar.gz | |
datapath: Scope global symbols with ovs_ prefix.
OVS has quite a few global symbols that should be scoped with a
prefix to prevent collisions with other modules in the kernel.
Suggested-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath/dp_notify.c')
| -rw-r--r-- | datapath/dp_notify.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c index 5d41d27ef..d040d46e7 100644 --- a/datapath/dp_notify.c +++ b/datapath/dp_notify.c @@ -29,38 +29,38 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event, struct net_device *dev = ptr; struct vport *vport; - if (is_internal_dev(dev)) - vport = internal_dev_get_vport(dev); + if (ovs_is_internal_dev(dev)) + vport = ovs_internal_dev_get_vport(dev); else - vport = netdev_get_vport(dev); + vport = ovs_netdev_get_vport(dev); if (!vport) return NOTIFY_DONE; switch (event) { case NETDEV_UNREGISTER: - if (!is_internal_dev(dev)) { + if (!ovs_is_internal_dev(dev)) { struct sk_buff *notify; notify = ovs_vport_cmd_build_info(vport, 0, 0, OVS_VPORT_CMD_DEL); - dp_detach_port(vport); + ovs_dp_detach_port(vport); if (IS_ERR(notify)) { netlink_set_err(INIT_NET_GENL_SOCK, 0, - dp_vport_multicast_group.id, + ovs_dp_vport_multicast_group.id, PTR_ERR(notify)); break; } - genlmsg_multicast(notify, 0, dp_vport_multicast_group.id, + genlmsg_multicast(notify, 0, ovs_dp_vport_multicast_group.id, GFP_KERNEL); } break; case NETDEV_CHANGENAME: if (vport->port_no != OVSP_LOCAL) { - dp_sysfs_del_if(vport); - dp_sysfs_add_if(vport); + ovs_dp_sysfs_del_if(vport); + ovs_dp_sysfs_add_if(vport); } break; } @@ -68,6 +68,6 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event, return NOTIFY_DONE; } -struct notifier_block dp_device_notifier = { +struct notifier_block ovs_dp_device_notifier = { .notifier_call = dp_device_event }; |