forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ovs-cleanups'

Browse source 
Jean Sacren says:

====================
Trivial fix-ups for openvswitch

This series does trivial fix-ups for openvswitch as follows:

1) Clean up the leftover of the unused function.

2) Fix up the twisted struct geneve_port member name.

3) Update the kernel doc to reflect the changes in struct vport.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-01-10 23:49:21 -05:00
commit 50ee63824f
2 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/openvswitch/vport-geneve.c
View file

@ -34,7 +34,7 @@ static struct vport_ops ovs_geneve_vport_ops;
* @dst_port: destination port. * @dst_port: destination port.
*/ */
struct geneve_port { struct geneve_port {
u16 port_no; u16 dst_port;
}; };
static inline struct geneve_port *geneve_vport(const struct vport *vport) static inline struct geneve_port *geneve_vport(const struct vport *vport)
@ -47,7 +47,7 @@ static int geneve_get_options(const struct vport *vport,
{ {
struct geneve_port *geneve_port = geneve_vport(vport); struct geneve_port *geneve_port = geneve_vport(vport);
if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, geneve_port->port_no)) if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, geneve_port->dst_port))
return -EMSGSIZE; return -EMSGSIZE;
return 0; return 0;
} }
@ -83,7 +83,7 @@ static struct vport *geneve_tnl_create(const struct vport_parms *parms)
return vport; return vport;
geneve_port = geneve_vport(vport); geneve_port = geneve_vport(vport);
geneve_port->port_no = dst_port; geneve_port->dst_port = dst_port;
rtnl_lock(); rtnl_lock();
dev = geneve_dev_create_fb(net, parms->name, NET_NAME_USER, dst_port); dev = geneve_dev_create_fb(net, parms->name, NET_NAME_USER, dst_port);

23
net/openvswitch/vport.h
View file

@ -70,7 +70,7 @@ struct vport_portids {
/** /**
* struct vport - one port within a datapath * struct vport - one port within a datapath
* @rcu: RCU callback head for deferred destruction. * @dev: Pointer to net_device.
* @dp: Datapath to which this port belongs. * @dp: Datapath to which this port belongs.
* @upcall_portids: RCU protected 'struct vport_portids'. * @upcall_portids: RCU protected 'struct vport_portids'.
* @port_no: Index into @dp's @ports array. * @port_no: Index into @dp's @ports array.
@ -78,6 +78,7 @@ struct vport_portids {
* @dp_hash_node: Element in @datapath->ports hash table in datapath.c. * @dp_hash_node: Element in @datapath->ports hash table in datapath.c.
* @ops: Class structure. * @ops: Class structure.
* @detach_list: list used for detaching vport in net-exit call. * @detach_list: list used for detaching vport in net-exit call.
* @rcu: RCU callback head for deferred destruction.
*/ */
struct vport { struct vport {
struct net_device *dev; struct net_device *dev;
@ -204,26 +205,6 @@ int __ovs_vport_ops_register(struct vport_ops *ops);
}) })
void ovs_vport_ops_unregister(struct vport_ops *ops); void ovs_vport_ops_unregister(struct vport_ops *ops);
static inline struct rtable *ovs_tunnel_route_lookup(struct net *net,
const struct ip_tunnel_key *key,
u32 mark,
struct flowi4 *fl,
u8 protocol)
{
struct rtable *rt;
memset(fl, 0, sizeof(*fl));
fl->daddr = key->u.ipv4.dst;
fl->saddr = key->u.ipv4.src;
fl->flowi4_tos = RT_TOS(key->tos);
fl->flowi4_mark = mark;
fl->flowi4_proto = protocol;
rt = ip_route_output_key(net, fl);
return rt;
}
void ovs_vport_send(struct vport *vport, struct sk_buff *skb); void ovs_vport_send(struct vport *vport, struct sk_buff *skb);
#endif /* vport.h */ #endif /* vport.h */