[ovs-dev] [netlink v4 52/52] dpif-linux: Replace 'minor' by 'dp_idx'.

Justin Pettit jpettit at nicira.com
Wed Jan 26 09:39:19 UTC 2011


Looks good.

(Jesse, I think with this commit, you have all the pieces reviewed that you farmed out to Ethan and me.)

--Justin


On Jan 11, 2011, at 9:50 PM, Ben Pfaff wrote:

> The dp_idx used to be the character device minor number, but there's no
> character device anymore, so rename for clarity.
> ---
> lib/dpif-linux.c |   48 ++++++++++++++++++++++++------------------------
> 1 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
> index 6ade2cd..8457c92 100644
> --- a/lib/dpif-linux.c
> +++ b/lib/dpif-linux.c
> @@ -126,7 +126,7 @@ struct dpif_linux {
> 
>     /* Used by dpif_linux_get_all_names(). */
>     char *local_ifname;
> -    int minor;
> +    int dp_idx;
> 
>     /* Change notification. */
>     int local_ifindex;          /* Ifindex of local port. */
> @@ -196,7 +196,7 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name,
>     struct dpif_linux_vport vport_request, vport;
>     struct dpif_linux_dp dp_request, dp;
>     struct ofpbuf *buf;
> -    int minor;
> +    int dp_idx;
>     int error;
> 
>     error = dpif_linux_init();
> @@ -204,14 +204,14 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name,
>         return error;
>     }
> 
> -    minor = !strncmp(name, "dp", 2)
> -            && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1;
> +    dp_idx = (!strncmp(name, "dp", 2)
> +              && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1);
> 
>     /* Create or look up datapath. */
>     dpif_linux_dp_init(&dp_request);
>     dp_request.cmd = create ? ODPDC_NEW : ODPDC_GET;
> -    dp_request.dp_idx = minor;
> -    dp_request.name = minor >= 0 ? NULL : name;
> +    dp_request.dp_idx = dp_idx;
> +    dp_request.name = dp_idx >= 0 ? NULL : name;
>     error = dpif_linux_dp_transact(&dp_request, &dp, &buf);
>     if (error) {
>         return error;
> @@ -223,7 +223,7 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name,
>     vport_request.cmd = ODPPC_GET;
>     vport_request.dp_idx = dp.dp_idx;
>     vport_request.port_no = ODPP_LOCAL;
> -    vport_request.name = minor >= 0 ? NULL : name;
> +    vport_request.name = dp_idx >= 0 ? NULL : name;
>     error = dpif_linux_vport_transact(&vport_request, &vport, &buf);
>     if (error) {
>         return error;
> @@ -267,7 +267,7 @@ open_dpif(const struct dpif_linux_dp *dp,
>     dpif->listen_mask = 0;
>     dpif->local_ifname = xstrdup(local_vport->name);
>     dpif->local_ifindex = local_vport->ifindex;
> -    dpif->minor = dp_idx;
> +    dpif->dp_idx = dp_idx;
>     shash_init(&dpif->changed_ports);
>     dpif->change_error = false;
>     *dpifp = &dpif->dpif;
> @@ -294,7 +294,7 @@ dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names)
> {
>     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
> 
> -    svec_add_nocopy(all_names, xasprintf("dp%d", dpif->minor));
> +    svec_add_nocopy(all_names, xasprintf("dp%d", dpif->dp_idx));
>     svec_add(all_names, dpif->local_ifname);
>     return 0;
> }
> @@ -307,7 +307,7 @@ dpif_linux_destroy(struct dpif *dpif_)
> 
>     dpif_linux_dp_init(&dp);
>     dp.cmd = ODPDC_DEL;
> -    dp.dp_idx = dpif->minor;
> +    dp.dp_idx = dpif->dp_idx;
>     return dpif_linux_dp_transact(&dp, NULL, NULL);
> }
> 
> @@ -349,7 +349,7 @@ dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags)
> 
>     dpif_linux_dp_init(&dp);
>     dp.cmd = ODPDC_SET;
> -    dp.dp_idx = dpif->minor;
> +    dp.dp_idx = dpif->dp_idx;
>     dp.ipv4_frags = drop_frags ? ODP_DP_FRAG_DROP : ODP_DP_FRAG_ZERO;
>     return dpif_linux_dp_transact(&dp, NULL, NULL);
> }
> @@ -399,7 +399,7 @@ dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no)
> 
>     dpif_linux_vport_init(&vport);
>     vport.cmd = ODPPC_DEL;
> -    vport.dp_idx = dpif->minor;
> +    vport.dp_idx = dpif->dp_idx;
>     vport.port_no = port_no;
>     return dpif_linux_vport_transact(&vport, NULL, NULL);
> }
> @@ -415,7 +415,7 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no,
> 
>     dpif_linux_vport_init(&request);
>     request.cmd = ODPPC_GET;
> -    request.dp_idx = dpif_linux_cast(dpif)->minor;
> +    request.dp_idx = dpif_linux_cast(dpif)->dp_idx;
>     request.port_no = port_no;
>     request.name = port_name;
> 
> @@ -459,7 +459,7 @@ dpif_linux_flow_flush(struct dpif *dpif_)
> 
>     dpif_linux_flow_init(&flow);
>     flow.cmd = ODPFC_DEL;
> -    flow.dp_idx = dpif->minor;
> +    flow.dp_idx = dpif->dp_idx;
>     return dpif_linux_flow_transact(&flow, NULL, NULL);
> }
> 
> @@ -479,7 +479,7 @@ dpif_linux_port_dump_start(const struct dpif *dpif_, void **statep)
> 
>     dpif_linux_vport_init(&request);
>     request.cmd = ODPDC_GET;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
> 
>     buf = ofpbuf_new(1024);
>     dpif_linux_vport_to_ofpbuf(&request, buf);
> @@ -563,7 +563,7 @@ dpif_linux_flow_get(const struct dpif *dpif_,
> 
>     dpif_linux_flow_init(&request);
>     request.cmd = ODPFC_GET;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
>     request.key = key;
>     request.key_len = key_len;
>     error = dpif_linux_flow_transact(&request, &reply, &buf);
> @@ -595,7 +595,7 @@ dpif_linux_flow_put(struct dpif *dpif_, enum dpif_flow_put_flags flags,
> 
>     dpif_linux_flow_init(&request);
>     request.cmd = flags & DPIF_FP_MODIFY ? ODPFC_NEW : ODPFC_SET;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
>     request.key = key;
>     request.key_len = key_len;
>     request.actions = actions;
> @@ -626,7 +626,7 @@ dpif_linux_flow_del(struct dpif *dpif_,
> 
>     dpif_linux_flow_init(&request);
>     request.cmd = ODPFC_DEL;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
>     request.key = key;
>     request.key_len = key_len;
>     error = dpif_linux_flow_transact(&request,
> @@ -657,7 +657,7 @@ dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep)
> 
>     dpif_linux_flow_init(&request);
>     request.cmd = ODPDC_GET;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
> 
>     buf = ofpbuf_new(1024);
>     dpif_linux_flow_to_ofpbuf(&request, buf);
> @@ -724,7 +724,7 @@ dpif_linux_execute(struct dpif *dpif_,
>                           ODPUC_EXECUTE, 1);
> 
>     upcall = ofpbuf_put_uninit(buf, sizeof *upcall);
> -    upcall->dp_idx = dpif->minor;
> +    upcall->dp_idx = dpif->dp_idx;
> 
>     nl_msg_put_unspec(buf, ODPUT_PACKET, packet->data, packet->size);
>     nl_msg_put_unspec(buf, ODPUT_ACTIONS, actions, actions_len);
> @@ -820,7 +820,7 @@ dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability)
> 
>     dpif_linux_dp_init(&dp);
>     dp.cmd = ODPDC_SET;
> -    dp.dp_idx = dpif->minor;
> +    dp.dp_idx = dpif->dp_idx;
>     dp.sampling = &probability;
>     return dpif_linux_dp_transact(&dp, NULL, NULL);
> }
> @@ -1047,9 +1047,9 @@ lookup_internal_device(const char *name, int *dp_idx, int *port_no)
> bool
> dpif_linux_is_internal_device(const char *name)
> {
> -    int minor, port_no;
> +    int dp_idx, port_no;
> 
> -    return !lookup_internal_device(name, &minor, &port_no);
> +    return !lookup_internal_device(name, &dp_idx, &port_no);
> }
> 
> static void
> @@ -1427,7 +1427,7 @@ dpif_linux_dp_get(const struct dpif *dpif_, struct dpif_linux_dp *reply,
> 
>     dpif_linux_dp_init(&request);
>     request.cmd = ODPDC_GET;
> -    request.dp_idx = dpif->minor;
> +    request.dp_idx = dpif->dp_idx;
> 
>     return dpif_linux_dp_transact(&request, reply, bufp);
> }
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org





More information about the dev mailing list