Commit 93d8fd15 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by Jesse Gross
Browse files

openvswitch: Simplify interface ovs_flow_metadata_from_nlattrs() 



This is not functional change, this is just code cleanup.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent b34df5e8

net/openvswitch/datapath.c

+1 −4
Original line number Diff line number Diff line
@@ -739,10 +739,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto err_flow_free;



	err = ovs_flow_metadata_from_nlattrs(&flow->key.phy.priority,

					     &flow->key.phy.skb_mark,

					     &flow->key.phy.in_port,

					     a[OVS_PACKET_ATTR_KEY]);

	err = ovs_flow_metadata_from_nlattrs(flow, a[OVS_PACKET_ATTR_KEY]);

	if (err)

		goto err_flow_free;

net/openvswitch/flow.c

+10 −12
Original line number Diff line number Diff line
@@ -1125,10 +1125,8 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, 


/**

 * ovs_flow_metadata_from_nlattrs - parses Netlink attributes into a flow key.

 * @priority: receives the skb priority

 * @mark: receives the skb mark

 * @in_port: receives the extracted input port.

 * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute

 * @flow: Receives extracted in_port, priority, tun_key and skb_mark.

 * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute

 * sequence.

 *

 * This parses a series of Netlink attributes that form a flow key, which must
@@ -1136,15 +1134,15 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, 
 * get the metadata, that is, the parts of the flow key that cannot be

 * extracted from the packet itself.

 */

int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,

int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,

				   const struct nlattr *attr)

{

	const struct nlattr *nla;

	int rem;



	*in_port = DP_MAX_PORTS;

	*priority = 0;

	*mark = 0;

	flow->key.phy.in_port = DP_MAX_PORTS;

	flow->key.phy.priority = 0;

	flow->key.phy.skb_mark = 0;



	nla_for_each_nested(nla, attr, rem) {

		int type = nla_type(nla);
@@ -1155,17 +1153,17 @@ int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port, 


			switch (type) {

			case OVS_KEY_ATTR_PRIORITY:

				*priority = nla_get_u32(nla);

				flow->key.phy.priority = nla_get_u32(nla);

				break;



			case OVS_KEY_ATTR_IN_PORT:

				if (nla_get_u32(nla) >= DP_MAX_PORTS)

					return -EINVAL;

				*in_port = nla_get_u32(nla);

				flow->key.phy.in_port = nla_get_u32(nla);

				break;



			case OVS_KEY_ATTR_SKB_MARK:

				*mark = nla_get_u32(nla);

				flow->key.phy.skb_mark = nla_get_u32(nla);

				break;

			}

		}

net/openvswitch/flow.h

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); 
int ovs_flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);

int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,

		      const struct nlattr *);

int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,

			       const struct nlattr *);

int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,

				  const struct nlattr *attr);



#define MAX_ACTIONS_BUFSIZE    (16 * 1024)

#define TBL_MIN_BUCKETS		1024