* @parms: Information about new vport.
*
* Creates a new vport with the specified configuration (which is dependent on
- * device type) and attaches it to a datapath. RTNL lock must be held.
+ * device type). RTNL lock must be held.
*/
struct vport *vport_add(const struct vport_parms *parms)
{
}
/**
- * vport_del - delete existing vport device (for kernel callers)
+ * vport_del - delete existing vport device
*
* @vport: vport to delete.
*
}
/**
- * vport_set_stats - sets offset device stats (for kernel callers)
+ * vport_set_stats - sets offset device stats
*
* @vport: vport on which to set stats
* @stats: stats to set
* Provides a set of transmit, receive, and error stats to be added as an
* offset to the collect data when stats are retreived. Some devices may not
* support setting the stats, in which case the result will always be
- * -EOPNOTSUPP. RTNL lock must be held.
+ * -EOPNOTSUPP.
+ *
+ * Must be called with RTNL lock.
*/
int vport_set_stats(struct vport *vport, struct rtnl_link_stats64 *stats)
{
*
* @vport: vport from which to retrieve the type.
*
- * Retrieves the type of the given device. Either RTNL lock or rcu_read_lock
- * must be held.
+ * Retrieves the type of the given device.
*/
-enum odp_vport_type vport_get_type(const struct vport *vport)
+enum ovs_vport_type vport_get_type(const struct vport *vport)
{
return vport->ops->type;
}
}
/**
- * vport_get_stats - retrieve device stats (for kernel callers)
+ * vport_get_stats - retrieve device stats
*
* @vport: vport from which to retrieve the stats
* @stats: location to store stats
*
* Retrieves transmit, receive, and error stats for the given device.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats)
{
*
* @vport: vport from which to retrieve the flags
*
- * Retrieves the flags of the given device. Either RTNL lock or rcu_read_lock
- * must be held.
+ * Retrieves the flags of the given device.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
unsigned vport_get_flags(const struct vport *vport)
{
*
* @vport: vport on which to check status.
*
- * Checks whether the given device is running. Either RTNL lock or
- * rcu_read_lock must be held.
+ * Checks whether the given device is running.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
int vport_is_running(const struct vport *vport)
{
*
* @vport: vport from which to check status
*
- * Retrieves the RFC2863 operstate of the given device. Either RTNL lock or
- * rcu_read_lock must be held.
+ * Retrieves the RFC2863 operstate of the given device.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
unsigned char vport_get_operstate(const struct vport *vport)
{
*
* Retrieves the system interface index of the given device or 0 if
* the device does not have one (in the case of virtual ports).
- * Returns a negative index on error. Either RTNL lock or
- * rcu_read_lock must be held.
+ * Returns a negative index on error.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
int vport_get_ifindex(const struct vport *vport)
{
* Retrieves the system link index of the given device. The link is the index
* of the interface on which the packet will actually be sent. In most cases
* this is the same as the ifindex but may be different for tunnel devices.
- * Returns a negative index on error. Either RTNL lock or rcu_read_lock must
- * be held.
+ * Returns a negative index on error.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
int vport_get_iflink(const struct vport *vport)
{
}
/**
- * vport_get_mtu - retrieve device MTU (for kernel callers)
+ * vport_get_mtu - retrieve device MTU
*
* @vport: vport from which to retrieve MTU
*
- * Retrieves the MTU of the given device. Either RTNL lock or rcu_read_lock
- * must be held.
+ * Retrieves the MTU of the given device. Returns 0 if @vport does not have an
+ * MTU (as e.g. some tunnels do not). Either RTNL lock or rcu_read_lock must
+ * be held.
*/
int vport_get_mtu(const struct vport *vport)
{
+ if (!vport->ops->get_mtu)
+ return 0;
return vport->ops->get_mtu(vport);
}
* @skb: sk_buff where options should be appended.
*
* Retrieves the configuration of the given device, appending an
- * %ODP_VPORT_ATTR_OPTIONS attribute that in turn contains nested
- * vport-specific attributes to @skb. Either RTNL lock or rcu_read_lock must
- * be held.
+ * %OVS_VPORT_ATTR_OPTIONS attribute that in turn contains nested
+ * vport-specific attributes to @skb.
*
* Returns 0 if successful, -EMSGSIZE if @skb has insufficient room, or another
- * negative error code if a real error occurred.
+ * negative error code if a real error occurred. If an error occurs, @skb is
+ * left unmodified.
+ *
+ * Must be called with RTNL lock or rcu_read_lock.
*/
int vport_get_options(const struct vport *vport, struct sk_buff *skb)
{
struct nlattr *nla;
- nla = nla_nest_start(skb, ODP_VPORT_ATTR_OPTIONS);
+ nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS);
if (!nla)
return -EMSGSIZE;
if (vport->ops->get_options) {
int err = vport->ops->get_options(vport, skb);
- if (err)
+ if (err) {
+ nla_nest_cancel(skb, nla);
return err;
+ }
}
nla_nest_end(skb, nla);
int sent;
mtu = vport_get_mtu(vport);
- if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {
+ if (mtu && unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {
if (net_ratelimit())
pr_warn("%s: dropped over-mtu packet: %d > %d\n",
dp_name(vport->dp), packet_length(skb), mtu);