[PATCH net-next] openvswitch: Remove unneeded ovs_netdev_get_ifindex()

[PATCH net-next] openvswitch: Remove unneeded ovs_netdev_get_ifindex()

[Thomas Graf]

The only user is get_dpifindex(), no need to redirect via the port
operations.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
---
 net/openvswitch/datapath.c           | 7 ++++---
 net/openvswitch/vport-internal_dev.c | 1 -
 net/openvswitch/vport-netdev.c       | 7 -------
 net/openvswitch/vport-netdev.h       | 1 -
 net/openvswitch/vport.h              | 2 --
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 74a5fe6..965c059 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -150,9 +150,10 @@ static int get_dpifindex(struct datapath *dp)
 	rcu_read_lock();
 
 	local = ovs_vport_rcu(dp, OVSP_LOCAL);
-	if (local)
-		ifindex = local->ops->get_ifindex(local);
-	else
+	if (local) {
+		const struct netdev_vport *vport = netdev_vport_priv(local);
+		ifindex = vport->dev->ifindex;
+	} else
 		ifindex = 0;
 
 	rcu_read_unlock();
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 73682de..84e0a03 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -232,7 +232,6 @@ const struct vport_ops ovs_internal_vport_ops = {
 	.create		= internal_dev_create,
 	.destroy	= internal_dev_destroy,
 	.get_name	= ovs_netdev_get_name,
-	.get_ifindex	= ovs_netdev_get_ifindex,
 	.send		= internal_dev_recv,
 };
 
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index 40a89ae..4f01c6d 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -150,12 +150,6 @@ const char *ovs_netdev_get_name(const struct vport *vport)
 	return netdev_vport->dev->name;
 }
 
-int ovs_netdev_get_ifindex(const struct vport *vport)
-{
-	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-	return netdev_vport->dev->ifindex;
-}
-
 static unsigned int packet_length(const struct sk_buff *skb)
 {
 	unsigned int length = skb->len - ETH_HLEN;
@@ -206,6 +200,5 @@ const struct vport_ops ovs_netdev_vport_ops = {
 	.create		= netdev_create,
 	.destroy	= netdev_destroy,
 	.get_name	= ovs_netdev_get_name,
-	.get_ifindex	= ovs_netdev_get_ifindex,
 	.send		= netdev_send,
 };
diff --git a/net/openvswitch/vport-netdev.h b/net/openvswitch/vport-netdev.h
index 6478079..a3cb3a3 100644
--- a/net/openvswitch/vport-netdev.h
+++ b/net/openvswitch/vport-netdev.h
@@ -40,6 +40,5 @@ netdev_vport_priv(const struct vport *vport)
 
 const char *ovs_netdev_get_name(const struct vport *);
 const char *ovs_netdev_get_config(const struct vport *);
-int ovs_netdev_get_ifindex(const struct vport *);
 
 #endif /* vport_netdev.h */
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 7ba08c3..68a377b 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -124,7 +124,6 @@ struct vport_parms {
  * have any configuration.
  * @get_name: Get the device's name.
  * @get_config: Get the device's configuration.
- * @get_ifindex: Get the system interface index associated with the device.
  * May be null if the device does not have an ifindex.
  * @send: Send a packet on the device.  Returns the length of the packet sent.
  */
@@ -141,7 +140,6 @@ struct vport_ops {
 	/* Called with rcu_read_lock or ovs_mutex. */
 	const char *(*get_name)(const struct vport *);
 	void (*get_config)(const struct vport *, void *);
-	int (*get_ifindex)(const struct vport *);
 
 	int (*send)(struct vport *, struct sk_buff *);
 };
-- 
1.7.11.7

Re: [PATCH net-next] openvswitch: Remove unneeded ovs_netdev_get_ifindex()

[Sergei Shtylyov]

Hello.

On 26-04-2013 16:40, Thomas Graf wrote:

> The only user is get_dpifindex(), no need to redirect via the port
> operations.

> Signed-off-by: Thomas Graf <tgraf@suug.ch>
[...]

> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
> index 74a5fe6..965c059 100644
> --- a/net/openvswitch/datapath.c
> +++ b/net/openvswitch/datapath.c
> @@ -150,9 +150,10 @@ static int get_dpifindex(struct datapath *dp)
>   	rcu_read_lock();
>
>   	local = ovs_vport_rcu(dp, OVSP_LOCAL);
> -	if (local)
> -		ifindex = local->ops->get_ifindex(local);
> -	else
> +	if (local) {
> +		const struct netdev_vport *vport = netdev_vport_priv(local);

    Empty line after declaration wouldn't hurt.

> +		ifindex = vport->dev->ifindex;
> +	} else
>   		ifindex = 0;
>
>   	rcu_read_unlock();

WBR, Sergei

Re: [PATCH net-next] openvswitch: Remove unneeded ovs_netdev_get_ifindex()

[Jesse Gross]

On Fri, Apr 26, 2013 at 5:40 AM, Thomas Graf <tgraf@suug.ch> wrote:
> The only user is get_dpifindex(), no need to redirect via the port
> operations.
>
> Signed-off-by: Thomas Graf <tgraf@suug.ch>

I'll let David take this one directly since my tree is otherwise empty
and the merge window is coming up.

Acked-by: Jesse Gross <jesse@nicira.com>

Re: [PATCH net-next] openvswitch: Remove unneeded ovs_netdev_get_ifindex()

[David Miller]

From: Thomas Graf <tgraf@suug.ch>
Date: Fri, 26 Apr 2013 14:40:55 +0200

> The only user is get_dpifindex(), no need to redirect via the port
> operations.
> 
> Signed-off-by: Thomas Graf <tgraf@suug.ch>

Please follow-up with the stylistic feedback given to you if you
haven't already, thanks.