projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
connmgr: Remove unused function ofconn_n_pending_opgroups().
[openvswitch]
/
datapath
/
vport.c
diff --git
a/datapath/vport.c
b/datapath/vport.c
index 852a3c69f5f00dbb15cfcdfecdec3e81333503f9..8ef96f73e1fc6ea7e77cb1881d5617e0be93ab85 100644
(file)
--- a/
datapath/vport.c
+++ b/
datapath/vport.c
@@
-605,12
+605,14
@@
int vport_get_iflink(const struct vport *vport)
*
* @vport: vport from which to retrieve MTU
*
*
* @vport: vport from which to retrieve MTU
*
- * Retrieves the MTU of the given device.
- *
- *
Must be called with RTNL lock or rcu_read_lock
.
+ * 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)
{
*/
int vport_get_mtu(const struct vport *vport)
{
+ if (!vport->ops->get_mtu)
+ return 0;
return vport->ops->get_mtu(vport);
}
return vport->ops->get_mtu(vport);
}
@@
-710,7
+712,7
@@
int vport_send(struct vport *vport, struct sk_buff *skb)
int sent;
mtu = vport_get_mtu(vport);
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);
if (net_ratelimit())
pr_warn("%s: dropped over-mtu packet: %d > %d\n",
dp_name(vport->dp), packet_length(skb), mtu);