summaryrefslogtreecommitdiff
path: root/datapath/datapath.c
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2013-08-07 19:47:59 -0700
committerJesse Gross <jesse@nicira.com>2013-08-09 12:47:43 -0700
commit54cc3ec63a40a5003bc070fbf70fc66ed7913fe4 (patch)
tree1133ab42f07ce0bdfaa51988f4bd303f3a38d668 /datapath/datapath.c
parentdc24a00f80e2e54e47d98fcffc679ce597b27ebb (diff)
downloadopenvswitch-54cc3ec63a40a5003bc070fbf70fc66ed7913fe4.tar.gz
datapath: Add 'ovs_' prefix to extern symbols.
The external symbols in the OVS kernel module are prefixed with 'ovs_' with the exception of ipv4_tun_to/from_nlattr(). This adds the prefix and makes the out of tree version consistent with upstream. Signed-off-by: Jesse Gross <jesse@nicira.com> Acked-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'datapath/datapath.c')
-rw-r--r--datapath/datapath.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c
index e5e06163a..190b61b9e 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -624,7 +624,7 @@ static int validate_and_copy_set_tun(const struct nlattr *attr,
int err, start;
ovs_match_init(&match, &key, NULL);
- err = ipv4_tun_from_nlattr(nla_data(attr), &match, false);
+ err = ovs_ipv4_tun_from_nlattr(nla_data(attr), &match, false);
if (err)
return err;
@@ -1065,8 +1065,8 @@ static int set_action_to_attr(const struct nlattr *a, struct sk_buff *skb)
if (!start)
return -EMSGSIZE;
- err = ipv4_tun_to_nlattr(skb,
- nla_data(ovs_key), nla_data(ovs_key));
+ err = ovs_ipv4_tun_to_nlattr(skb, nla_data(ovs_key),
+ nla_data(ovs_key));
if (err)
return err;
nla_nest_end(skb, start);