Looks good to me. Acked-by: Andy Zhou <[email protected]>
On Wed, Aug 7, 2013 at 8:25 PM, Jesse Gross <[email protected]> wrote: > 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 <[email protected]> > --- > datapath/datapath.c | 6 +++--- > datapath/flow.c | 14 +++++++------- > datapath/flow.h | 10 +++++----- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/datapath/datapath.c b/datapath/datapath.c > index e5e0616..190b61b 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); > diff --git a/datapath/flow.c b/datapath/flow.c > index e259e6d..e610065 100644 > --- a/datapath/flow.c > +++ b/datapath/flow.c > @@ -1174,8 +1174,8 @@ static int parse_flow_nlattrs(const struct nlattr > *attr, > return __parse_flow_nlattrs(attr, a, attrsp, false); > } > > -int ipv4_tun_from_nlattr(const struct nlattr *attr, > - struct sw_flow_match *match, bool is_mask) > +int ovs_ipv4_tun_from_nlattr(const struct nlattr *attr, > + struct sw_flow_match *match, bool is_mask) > { > struct nlattr *a; > int rem; > @@ -1263,9 +1263,9 @@ int ipv4_tun_from_nlattr(const struct nlattr *attr, > return 0; > } > > -int ipv4_tun_to_nlattr(struct sk_buff *skb, > - const struct ovs_key_ipv4_tunnel *tun_key, > - const struct ovs_key_ipv4_tunnel *output) > +int ovs_ipv4_tun_to_nlattr(struct sk_buff *skb, > + const struct ovs_key_ipv4_tunnel *tun_key, > + const struct ovs_key_ipv4_tunnel *output) > { > struct nlattr *nla; > > @@ -1334,7 +1334,7 @@ static int metadata_from_nlattrs(struct > sw_flow_match *match, u64 *attrs, > *attrs &= ~(1ULL << OVS_KEY_ATTR_SKB_MARK); > } > if (*attrs & (1ULL << OVS_KEY_ATTR_TUNNEL)) { > - if (ipv4_tun_from_nlattr(a[OVS_KEY_ATTR_TUNNEL], match, > + if (ovs_ipv4_tun_from_nlattr(a[OVS_KEY_ATTR_TUNNEL], match, > is_mask)) > return -EINVAL; > *attrs &= ~(1ULL << OVS_KEY_ATTR_TUNNEL); > @@ -1704,7 +1704,7 @@ int ovs_flow_to_nlattrs(const struct sw_flow_key > *swkey, > goto nla_put_failure; > > if ((swkey->tun_key.ipv4_dst || is_mask) && > - ipv4_tun_to_nlattr(skb, &swkey->tun_key, &output->tun_key)) > + ovs_ipv4_tun_to_nlattr(skb, &swkey->tun_key, &output->tun_key)) > goto nla_put_failure; > > if (swkey->phy.in_port == DP_MAX_PORTS) { > diff --git a/datapath/flow.h b/datapath/flow.h > index 59c7f6e..5d15783 100644 > --- a/datapath/flow.h > +++ b/datapath/flow.h > @@ -222,11 +222,11 @@ void ovs_flow_remove(struct flow_table *table, > struct sw_flow *flow); > > struct sw_flow *ovs_flow_dump_next(struct flow_table *table, u32 *bucket, > u32 *idx); > extern const int ovs_key_lens[OVS_KEY_ATTR_MAX + 1]; > -int ipv4_tun_from_nlattr(const struct nlattr *attr, > - struct sw_flow_match *match, bool is_mask); > -int ipv4_tun_to_nlattr(struct sk_buff *skb, > - const struct ovs_key_ipv4_tunnel *tun_key, > - const struct ovs_key_ipv4_tunnel *output); > +int ovs_ipv4_tun_from_nlattr(const struct nlattr *attr, > + struct sw_flow_match *match, bool is_mask); > +int ovs_ipv4_tun_to_nlattr(struct sk_buff *skb, > + const struct ovs_key_ipv4_tunnel *tun_key, > + const struct ovs_key_ipv4_tunnel *output); > > bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow, > const struct sw_flow_key *key, int key_len); > -- > 1.8.1.2 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev >
_______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
