leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openvswitch: Remove unneeded ovs_netdev_get_ifindex()

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

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Graf 2013-04-29 13:06:41 +00:00 committed by David S. Miller
parent 0c772159d1
commit cff63a5292
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/openvswitch/datapath.c
View File

@ -56,6 +56,7 @@
#include "datapath.h" #include "datapath.h"
#include "flow.h" #include "flow.h"
#include "vport-internal_dev.h" #include "vport-internal_dev.h"
#include "vport-netdev.h"
#define REHASH_FLOW_INTERVAL (10 * 60 * HZ) #define REHASH_FLOW_INTERVAL (10 * 60 * HZ)
@ -151,7 +152,7 @@ static int get_dpifindex(struct datapath *dp)
local = ovs_vport_rcu(dp, OVSP_LOCAL); local = ovs_vport_rcu(dp, OVSP_LOCAL);
if (local) if (local)
ifindex = local->ops->get_ifindex(local); ifindex = netdev_vport_priv(local)->dev->ifindex;
else else
ifindex = 0; ifindex = 0;

1
net/openvswitch/vport-internal_dev.c
View File

@ -232,7 +232,6 @@ const struct vport_ops ovs_internal_vport_ops = {
.create = internal_dev_create, .create = internal_dev_create,
.destroy = internal_dev_destroy, .destroy = internal_dev_destroy,
.get_name = ovs_netdev_get_name, .get_name = ovs_netdev_get_name,
.get_ifindex = ovs_netdev_get_ifindex,
.send = internal_dev_recv, .send = internal_dev_recv,
}; };

7
net/openvswitch/vport-netdev.c
View File

@ -150,12 +150,6 @@ const char *ovs_netdev_get_name(const struct vport *vport)
return netdev_vport->dev->name; 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) static unsigned int packet_length(const struct sk_buff *skb)
{ {
unsigned int length = skb->len - ETH_HLEN; unsigned int length = skb->len - ETH_HLEN;
@ -206,6 +200,5 @@ const struct vport_ops ovs_netdev_vport_ops = {
.create = netdev_create, .create = netdev_create,
.destroy = netdev_destroy, .destroy = netdev_destroy,
.get_name = ovs_netdev_get_name, .get_name = ovs_netdev_get_name,
.get_ifindex = ovs_netdev_get_ifindex,
.send = netdev_send, .send = netdev_send,
}; };

1
net/openvswitch/vport-netdev.h
View File

@ -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_name(const struct vport *);
const char *ovs_netdev_get_config(const struct vport *); const char *ovs_netdev_get_config(const struct vport *);
int ovs_netdev_get_ifindex(const struct vport *);
#endif /* vport_netdev.h */ #endif /* vport_netdev.h */

2
net/openvswitch/vport.h
View File

@ -124,7 +124,6 @@ struct vport_parms {
* have any configuration. * have any configuration.
* @get_name: Get the device's name. * @get_name: Get the device's name.
* @get_config: Get the device's configuration. * @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. * 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. * @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. */ /* Called with rcu_read_lock or ovs_mutex. */
const char *(*get_name)(const struct vport *); const char *(*get_name)(const struct vport *);
void (*get_config)(const struct vport *, void *); void (*get_config)(const struct vport *, void *);
int (*get_ifindex)(const struct vport *);
int (*send)(struct vport *, struct sk_buff *); int (*send)(struct vport *, struct sk_buff *);
}; };