openvswitch: Constify various function arguments

Thomas Graf · Pravin B Shelar · commit 12eb18f71158 · 2014-11-09T18:58:44.000-08:00
Help produce better optimized code.

Signed-off-by: Thomas Graf &lt;tgraf@noironetworks.com&gt;
Signed-off-by: Pravin B Shelar &lt;pshelar@nicira.com&gt;
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
@@ -69,7 +69,7 @@ static void action_fifo_init(struct action_fifo *fifo)
 	fifo->tail = 0;
 }
 
-static bool action_fifo_is_empty(struct action_fifo *fifo)
+static bool action_fifo_is_empty(const struct action_fifo *fifo)
 {
 	return (fifo->head == fifo->tail);
 }
@@ -92,7 +92,7 @@ static struct deferred_action *action_fifo_put(struct action_fifo *fifo)
 
 /* Return true if fifo is not full */
 static struct deferred_action *add_deferred_actions(struct sk_buff *skb,
-						    struct sw_flow_key *key,
+						    const struct sw_flow_key *key,
 						    const struct nlattr *attr)
 {
 	struct action_fifo *fifo;
@@ -944,7 +944,8 @@ static void process_deferred_actions(struct datapath *dp)
 
 /* Execute a list of actions against 'skb'. */
 int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
-			struct sw_flow_actions *acts, struct sw_flow_key *key)
+			const struct sw_flow_actions *acts,
+			struct sw_flow_key *key)
 {
 	int level = this_cpu_read(exec_actions_level);
 	int err;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
@@ -178,7 +178,7 @@ const char *ovs_dp_name(const struct datapath *dp)
 	return vport->ops->get_name(vport);
 }
 
-static int get_dpifindex(struct datapath *dp)
+static int get_dpifindex(const struct datapath *dp)
 {
 	struct vport *local;
 	int ifindex;
@@ -633,7 +633,7 @@ static struct genl_family dp_packet_genl_family = {
 	.n_ops = ARRAY_SIZE(dp_packet_genl_ops),
 };
 
-static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats,
+static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
 			 struct ovs_dp_megaflow_stats *mega_stats)
 {
 	int i;
@@ -1352,7 +1352,7 @@ static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info)
 
 /* Called with rcu_read_lock or ovs_mutex. */
 static struct datapath *lookup_datapath(struct net *net,
-					struct ovs_header *ovs_header,
+					const struct ovs_header *ovs_header,
 					struct nlattr *a[OVS_DP_ATTR_MAX + 1])
 {
 	struct datapath *dp;
@@ -1380,7 +1380,7 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *in
 	dp->user_features = 0;
 }
 
-static void ovs_dp_change(struct datapath *dp, struct nlattr **a)
+static void ovs_dp_change(struct datapath *dp, struct nlattr *a[])
 {
 	if (a[OVS_DP_ATTR_USER_FEATURES])
 		dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]);
@@ -1744,7 +1744,7 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 portid,
 
 /* Called with ovs_mutex or RCU read lock. */
 static struct vport *lookup_vport(struct net *net,
-				  struct ovs_header *ovs_header,
+				  const struct ovs_header *ovs_header,
 				  struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
 {
 	struct datapath *dp;
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
@@ -149,7 +149,7 @@ int lockdep_ovsl_is_held(void);
 #define rcu_dereference_ovsl(p)					\
 	rcu_dereference_check(p, lockdep_ovsl_is_held())
 
-static inline struct net *ovs_dp_get_net(struct datapath *dp)
+static inline struct net *ovs_dp_get_net(const struct datapath *dp)
 {
 	return read_pnet(&dp->net);
 }
@@ -192,7 +192,7 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
 					 u8 cmd);
 
 int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
-			struct sw_flow_actions *acts, struct sw_flow_key *);
+			const struct sw_flow_actions *, struct sw_flow_key *);
 
 void ovs_dp_notify_wq(struct work_struct *work);
 
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
@@ -66,7 +66,7 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies)
 #define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))
 
 void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
-			   struct sk_buff *skb)
+			   const struct sk_buff *skb)
 {
 	struct flow_stats *stats;
 	int node = numa_node_id();
@@ -679,7 +679,7 @@ int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key)
 	return key_extract(skb, key);
 }
 
-int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info,
+int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info,
 			 struct sk_buff *skb, struct sw_flow_key *key)
 {
 	/* Extract metadata from packet. */
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
@@ -53,7 +53,7 @@ struct ovs_key_ipv4_tunnel {
 
 struct ovs_tunnel_info {
 	struct ovs_key_ipv4_tunnel tunnel;
-	struct geneve_opt *options;
+	const struct geneve_opt *options;
 	u8 options_len;
 };
 
@@ -73,7 +73,7 @@ static inline void __ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
 					    __be16 tp_dst,
 					    __be64 tun_id,
 					    __be16 tun_flags,
-					    struct geneve_opt *opts,
+					    const struct geneve_opt *opts,
 					    u8 opts_len)
 {
 	tun_info->tunnel.tun_id = tun_id;
@@ -105,7 +105,7 @@ static inline void ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
 					  __be16 tp_dst,
 					  __be64 tun_id,
 					  __be16 tun_flags,
-					  struct geneve_opt *opts,
+					  const struct geneve_opt *opts,
 					  u8 opts_len)
 {
 	__ovs_flow_tun_info_init(tun_info, iph->saddr, iph->daddr,
@@ -244,14 +244,15 @@ struct arp_eth_header {
 } __packed;
 
 void ovs_flow_stats_update(struct sw_flow *, __be16 tcp_flags,
-			   struct sk_buff *);
+			   const struct sk_buff *);
 void ovs_flow_stats_get(const struct sw_flow *, struct ovs_flow_stats *,
 			unsigned long *used, __be16 *tcp_flags);
 void ovs_flow_stats_clear(struct sw_flow *);
 u64 ovs_flow_used_time(unsigned long flow_jiffies);
 
 int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key);
-int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info, struct sk_buff *skb,
+int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info,
+			 struct sk_buff *skb,
 			 struct sw_flow_key *key);
 /* Extract key from packet coming from userspace. */
 int ovs_flow_key_extract_userspace(const struct nlattr *attr,
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
@@ -107,7 +107,7 @@ struct sw_flow *ovs_flow_alloc(void)
 	return ERR_PTR(-ENOMEM);
 }
 
-int ovs_flow_tbl_count(struct flow_table *table)
+int ovs_flow_tbl_count(const struct flow_table *table)
 {
 	return table->count;
 }
@@ -401,7 +401,7 @@ static bool flow_cmp_masked_key(const struct sw_flow *flow,
 }
 
 bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,
-			       struct sw_flow_match *match)
+			       const struct sw_flow_match *match)
 {
 	struct sw_flow_key *key = match->key;
 	int key_start = flow_key_start(key);
@@ -412,7 +412,7 @@ bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,
 
 static struct sw_flow *masked_flow_lookup(struct table_instance *ti,
 					  const struct sw_flow_key *unmasked,
-					  struct sw_flow_mask *mask)
+					  const struct sw_flow_mask *mask)
 {
 	struct sw_flow *flow;
 	struct hlist_head *head;
@@ -460,7 +460,7 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
 }
 
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
-					  struct sw_flow_match *match)
+					  const struct sw_flow_match *match)
 {
 	struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);
 	struct sw_flow_mask *mask;
@@ -563,7 +563,7 @@ static struct sw_flow_mask *flow_mask_find(const struct flow_table *tbl,
 
 /* Add 'mask' into the mask list, if it is not already there. */
 static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow,
-			    struct sw_flow_mask *new)
+			    const struct sw_flow_mask *new)
 {
 	struct sw_flow_mask *mask;
 	mask = flow_mask_find(tbl, new);
@@ -586,7 +586,7 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow,
 
 /* Must be called with OVS mutex held. */
 int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow,
-			struct sw_flow_mask *mask)
+			const struct sw_flow_mask *mask)
 {
 	struct table_instance *new_ti = NULL;
 	struct table_instance *ti;
diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h
@@ -61,12 +61,12 @@ struct sw_flow *ovs_flow_alloc(void);
 void ovs_flow_free(struct sw_flow *, bool deferred);
 
 int ovs_flow_tbl_init(struct flow_table *);
-int ovs_flow_tbl_count(struct flow_table *table);
+int ovs_flow_tbl_count(const struct flow_table *table);
 void ovs_flow_tbl_destroy(struct flow_table *table);
 int ovs_flow_tbl_flush(struct flow_table *flow_table);
 
 int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow,
-			struct sw_flow_mask *mask);
+			const struct sw_flow_mask *mask);
 void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow);
 int  ovs_flow_tbl_num_masks(const struct flow_table *table);
 struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,
@@ -77,9 +77,9 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,
 struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,
 				    const struct sw_flow_key *);
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
-					  struct sw_flow_match *match);
+					  const struct sw_flow_match *match);
 bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,
-			       struct sw_flow_match *match);
+			       const struct sw_flow_match *match);
 
 void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
 		       const struct sw_flow_mask *mask);
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
@@ -68,7 +68,7 @@ static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)
 }
 
 /* Convert 24 bit VNI to 64 bit tunnel ID. */
-static __be64 vni_to_tunnel_id(__u8 *vni)
+static __be64 vni_to_tunnel_id(const __u8 *vni)
 {
 #ifdef __BIG_ENDIAN
 	return (vni[0] << 16) | (vni[1] << 8) | vni[2];
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
@@ -77,7 +77,7 @@ static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)
 	return RX_HANDLER_CONSUMED;
 }
 
-static struct net_device *get_dpdev(struct datapath *dp)
+static struct net_device *get_dpdev(const struct datapath *dp)
 {
 	struct vport *local;
 
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
@@ -68,7 +68,7 @@ void ovs_vport_exit(void)
 	kfree(dev_table);
 }
 
-static struct hlist_head *hash_bucket(struct net *net, const char *name)
+static struct hlist_head *hash_bucket(const struct net *net, const char *name)
 {
 	unsigned int hash = jhash(name, strlen(name), (unsigned long) net);
 	return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)];
@@ -107,7 +107,7 @@ EXPORT_SYMBOL_GPL(ovs_vport_ops_unregister);
  *
  * Must be called with ovs or RCU read lock.
  */
-struct vport *ovs_vport_locate(struct net *net, const char *name)
+struct vport *ovs_vport_locate(const struct net *net, const char *name)
 {
 	struct hlist_head *bucket = hash_bucket(net, name);
 	struct vport *vport;
@@ -380,7 +380,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
  *
  * Must be called with ovs_mutex.
  */
-int ovs_vport_set_upcall_portids(struct vport *vport,  struct nlattr *ids)
+int ovs_vport_set_upcall_portids(struct vport *vport, const struct nlattr *ids)
 {
 	struct vport_portids *old, *vport_portids;
 
@@ -471,7 +471,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb)
  * skb->data should point to the Ethernet header.
  */
 void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
-		       struct ovs_tunnel_info *tun_info)
+		       const struct ovs_tunnel_info *tun_info)
 {
 	struct pcpu_sw_netstats *stats;
 	struct sw_flow_key key;
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
@@ -45,14 +45,14 @@ void ovs_vport_exit(void);
 struct vport *ovs_vport_add(const struct vport_parms *);
 void ovs_vport_del(struct vport *);
 
-struct vport *ovs_vport_locate(struct net *net, const char *name);
+struct vport *ovs_vport_locate(const struct net *net, const char *name);
 
 void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
 
 int ovs_vport_set_options(struct vport *, struct nlattr *options);
 int ovs_vport_get_options(const struct vport *, struct sk_buff *);
 
-int ovs_vport_set_upcall_portids(struct vport *, struct nlattr *pids);
+int ovs_vport_set_upcall_portids(struct vport *, const struct nlattr *pids);
 int ovs_vport_get_upcall_portids(const struct vport *, struct sk_buff *);
 u32 ovs_vport_find_upcall_portid(const struct vport *, struct sk_buff *);
 
@@ -224,7 +224,7 @@ static inline struct vport *vport_from_priv(void *priv)
 }
 
 void ovs_vport_receive(struct vport *, struct sk_buff *,
-		       struct ovs_tunnel_info *);
+		       const struct ovs_tunnel_info *);
 
 static inline void ovs_skb_postpush_rcsum(struct sk_buff *skb,
 				      const void *start, unsigned int len)

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ static void action_fifo_init(struct action_fifo *fifo)`
`69`	`69`	`fifo->tail = 0;`
`70`	`70`	`}`
`71`	`71`
`72`		`-static bool action_fifo_is_empty(struct action_fifo *fifo)`
	`72`	`+static bool action_fifo_is_empty(const struct action_fifo *fifo)`
`73`	`73`	`{`
`74`	`74`	`return (fifo->head == fifo->tail);`
`75`	`75`	`}`
`@@ -92,7 +92,7 @@ static struct deferred_action action_fifo_put(struct action_fifo fifo)`
`92`	`92`
`93`	`93`	`/* Return true if fifo is not full */`
`94`	`94`	`static struct deferred_action add_deferred_actions(struct sk_buff skb,`
`95`		`- struct sw_flow_key *key,`
	`95`	`+ const struct sw_flow_key *key,`
`96`	`96`	`const struct nlattr *attr)`
`97`	`97`	`{`
`98`	`98`	`struct action_fifo *fifo;`
`@@ -944,7 +944,8 @@ static void process_deferred_actions(struct datapath *dp)`
`944`	`944`
`945`	`945`	`/* Execute a list of actions against 'skb'. */`
`946`	`946`	`int ovs_execute_actions(struct datapath dp, struct sk_buff skb,`
`947`		`- struct sw_flow_actions acts, struct sw_flow_key key)`
	`947`	`+ const struct sw_flow_actions *acts,`
	`948`	`+ struct sw_flow_key *key)`
`948`	`949`	`{`
`949`	`950`	`int level = this_cpu_read(exec_actions_level);`
`950`	`951`	`int err;`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ const char ovs_dp_name(const struct datapath dp)`
`178`	`178`	`return vport->ops->get_name(vport);`
`179`	`179`	`}`
`180`	`180`
`181`		`-static int get_dpifindex(struct datapath *dp)`
	`181`	`+static int get_dpifindex(const struct datapath *dp)`
`182`	`182`	`{`
`183`	`183`	`struct vport *local;`
`184`	`184`	`int ifindex;`
`@@ -633,7 +633,7 @@ static struct genl_family dp_packet_genl_family = {`
`633`	`633`	`.n_ops = ARRAY_SIZE(dp_packet_genl_ops),`
`634`	`634`	`};`
`635`	`635`
`636`		`-static void get_dp_stats(struct datapath dp, struct ovs_dp_stats stats,`
	`636`	`+static void get_dp_stats(const struct datapath dp, struct ovs_dp_stats stats,`
`637`	`637`	`struct ovs_dp_megaflow_stats *mega_stats)`
`638`	`638`	`{`
`639`	`639`	`int i;`
`@@ -1352,7 +1352,7 @@ static struct sk_buff ovs_dp_cmd_alloc_info(struct genl_info info)`
`1352`	`1352`
`1353`	`1353`	`/* Called with rcu_read_lock or ovs_mutex. */`
`1354`	`1354`	`static struct datapath lookup_datapath(struct net net,`
`1355`		`- struct ovs_header *ovs_header,`
	`1355`	`+ const struct ovs_header *ovs_header,`
`1356`	`1356`	`struct nlattr *a[OVS_DP_ATTR_MAX + 1])`
`1357`	`1357`	`{`
`1358`	`1358`	`struct datapath *dp;`
`@@ -1380,7 +1380,7 @@ static void ovs_dp_reset_user_features(struct sk_buff skb, struct genl_info in`
`1380`	`1380`	`dp->user_features = 0;`
`1381`	`1381`	`}`
`1382`	`1382`
`1383`		`-static void ovs_dp_change(struct datapath dp, struct nlattr *a)`
	`1383`	`+static void ovs_dp_change(struct datapath dp, struct nlattr a[])`
`1384`	`1384`	`{`
`1385`	`1385`	`if (a[OVS_DP_ATTR_USER_FEATURES])`
`1386`	`1386`	`dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]);`
`@@ -1744,7 +1744,7 @@ struct sk_buff ovs_vport_cmd_build_info(struct vport vport, u32 portid,`
`1744`	`1744`
`1745`	`1745`	`/* Called with ovs_mutex or RCU read lock. */`
`1746`	`1746`	`static struct vport lookup_vport(struct net net,`
`1747`		`- struct ovs_header *ovs_header,`
	`1747`	`+ const struct ovs_header *ovs_header,`
`1748`	`1748`	`struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])`
`1749`	`1749`	`{`
`1750`	`1750`	`struct datapath *dp;`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ int lockdep_ovsl_is_held(void);`
`149`	`149`	`#define rcu_dereference_ovsl(p) \`
`150`	`150`	`rcu_dereference_check(p, lockdep_ovsl_is_held())`
`151`	`151`
`152`		`-static inline struct net ovs_dp_get_net(struct datapath dp)`
	`152`	`+static inline struct net ovs_dp_get_net(const struct datapath dp)`
`153`	`153`	`{`
`154`	`154`	`return read_pnet(&dp->net);`
`155`	`155`	`}`
`@@ -192,7 +192,7 @@ struct sk_buff ovs_vport_cmd_build_info(struct vport , u32 pid, u32 seq,`
`192`	`192`	`u8 cmd);`
`193`	`193`
`194`	`194`	`int ovs_execute_actions(struct datapath dp, struct sk_buff skb,`
`195`		`- struct sw_flow_actions acts, struct sw_flow_key );`
	`195`	`+ const struct sw_flow_actions , struct sw_flow_key );`
`196`	`196`
`197`	`197`	`void ovs_dp_notify_wq(struct work_struct *work);`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies)`
`66`	`66`	`#define TCP_FLAGS_BE16(tp) ((__be16 )&tcp_flag_word(tp) & htons(0x0FFF))`
`67`	`67`
`68`	`68`	`void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,`
`69`		`- struct sk_buff *skb)`
	`69`	`+ const struct sk_buff *skb)`
`70`	`70`	`{`
`71`	`71`	`struct flow_stats *stats;`
`72`	`72`	`int node = numa_node_id();`
`@@ -679,7 +679,7 @@ int ovs_flow_key_update(struct sk_buff skb, struct sw_flow_key key)`
`679`	`679`	`return key_extract(skb, key);`
`680`	`680`	`}`
`681`	`681`
`682`		`-int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info,`
	`682`	`+int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info,`
`683`	`683`	`struct sk_buff skb, struct sw_flow_key key)`
`684`	`684`	`{`
`685`	`685`	`/* Extract metadata from packet. */`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ struct sw_flow *ovs_flow_alloc(void)`
`107`	`107`	`return ERR_PTR(-ENOMEM);`
`108`	`108`	`}`
`109`	`109`
`110`		`-int ovs_flow_tbl_count(struct flow_table *table)`
	`110`	`+int ovs_flow_tbl_count(const struct flow_table *table)`
`111`	`111`	`{`
`112`	`112`	`return table->count;`
`113`	`113`	`}`
`@@ -401,7 +401,7 @@ static bool flow_cmp_masked_key(const struct sw_flow *flow,`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,`
`404`		`- struct sw_flow_match *match)`
	`404`	`+ const struct sw_flow_match *match)`
`405`	`405`	`{`
`406`	`406`	`struct sw_flow_key *key = match->key;`
`407`	`407`	`int key_start = flow_key_start(key);`
`@@ -412,7 +412,7 @@ bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,`
`412`	`412`
`413`	`413`	`static struct sw_flow masked_flow_lookup(struct table_instance ti,`
`414`	`414`	`const struct sw_flow_key *unmasked,`
`415`		`- struct sw_flow_mask *mask)`
	`415`	`+ const struct sw_flow_mask *mask)`
`416`	`416`	`{`
`417`	`417`	`struct sw_flow *flow;`
`418`	`418`	`struct hlist_head *head;`
`@@ -460,7 +460,7 @@ struct sw_flow ovs_flow_tbl_lookup(struct flow_table tbl,`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`struct sw_flow ovs_flow_tbl_lookup_exact(struct flow_table tbl,`
`463`		`- struct sw_flow_match *match)`
	`463`	`+ const struct sw_flow_match *match)`
`464`	`464`	`{`
`465`	`465`	`struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);`
`466`	`466`	`struct sw_flow_mask *mask;`
`@@ -563,7 +563,7 @@ static struct sw_flow_mask flow_mask_find(const struct flow_table tbl,`
`563`	`563`
`564`	`564`	`/* Add 'mask' into the mask list, if it is not already there. */`
`565`	`565`	`static int flow_mask_insert(struct flow_table tbl, struct sw_flow flow,`
`566`		`- struct sw_flow_mask *new)`
	`566`	`+ const struct sw_flow_mask *new)`
`567`	`567`	`{`
`568`	`568`	`struct sw_flow_mask *mask;`
`569`	`569`	`mask = flow_mask_find(tbl, new);`
`@@ -586,7 +586,7 @@ static int flow_mask_insert(struct flow_table tbl, struct sw_flow flow,`
`586`	`586`
`587`	`587`	`/* Must be called with OVS mutex held. */`
`588`	`588`	`int ovs_flow_tbl_insert(struct flow_table table, struct sw_flow flow,`
`589`		`- struct sw_flow_mask *mask)`
	`589`	`+ const struct sw_flow_mask *mask)`
`590`	`590`	`{`
`591`	`591`	`struct table_instance *new_ti = NULL;`
`592`	`592`	`struct table_instance *ti;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/* Convert 24 bit VNI to 64 bit tunnel ID. */`
`71`		`-static __be64 vni_to_tunnel_id(__u8 *vni)`
	`71`	`+static __be64 vni_to_tunnel_id(const __u8 *vni)`
`72`	`72`	`{`
`73`	`73`	`#ifdef __BIG_ENDIAN`
`74`	`74`	`return (vni[0] << 16) \| (vni[1] << 8) \| vni[2];`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)`
`77`	`77`	`return RX_HANDLER_CONSUMED;`
`78`	`78`	`}`
`79`	`79`
`80`		`-static struct net_device get_dpdev(struct datapath dp)`
	`80`	`+static struct net_device get_dpdev(const struct datapath dp)`
`81`	`81`	`{`
`82`	`82`	`struct vport *local;`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ void ovs_vport_exit(void)`
`68`	`68`	`kfree(dev_table);`
`69`	`69`	`}`
`70`	`70`
`71`		`-static struct hlist_head hash_bucket(struct net net, const char *name)`
	`71`	`+static struct hlist_head hash_bucket(const struct net net, const char *name)`
`72`	`72`	`{`
`73`	`73`	`unsigned int hash = jhash(name, strlen(name), (unsigned long) net);`
`74`	`74`	`return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)];`
`@@ -107,7 +107,7 @@ EXPORT_SYMBOL_GPL(ovs_vport_ops_unregister);`
`107`	`107`	`*`
`108`	`108`	`* Must be called with ovs or RCU read lock.`
`109`	`109`	`*/`
`110`		`-struct vport ovs_vport_locate(struct net net, const char *name)`
	`110`	`+struct vport ovs_vport_locate(const struct net net, const char *name)`
`111`	`111`	`{`
`112`	`112`	`struct hlist_head *bucket = hash_bucket(net, name);`
`113`	`113`	`struct vport *vport;`
`@@ -380,7 +380,7 @@ int ovs_vport_get_options(const struct vport vport, struct sk_buff skb)`
`380`	`380`	`*`
`381`	`381`	`* Must be called with ovs_mutex.`
`382`	`382`	`*/`
`383`		`-int ovs_vport_set_upcall_portids(struct vport vport, struct nlattr ids)`
	`383`	`+int ovs_vport_set_upcall_portids(struct vport vport, const struct nlattr ids)`
`384`	`384`	`{`
`385`	`385`	`struct vport_portids old, vport_portids;`
`386`	`386`
`@@ -471,7 +471,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport vport, struct sk_buff skb)`
`471`	`471`	`* skb->data should point to the Ethernet header.`
`472`	`472`	`*/`
`473`	`473`	`void ovs_vport_receive(struct vport vport, struct sk_buff skb,`
`474`		`- struct ovs_tunnel_info *tun_info)`
	`474`	`+ const struct ovs_tunnel_info *tun_info)`
`475`	`475`	`{`
`476`	`476`	`struct pcpu_sw_netstats *stats;`
`477`	`477`	`struct sw_flow_key key;`