projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Allow encoding of Open Flow 1.2 Flow Removed messages
[openvswitch]
/
datapath
/
vport-netdev.c
diff --git
a/datapath/vport-netdev.c
b/datapath/vport-netdev.c
index 05d7696faa0ee59e72fa6389ffd4ae176b2bb47d..009855478a749688e738c49429d7b874601cd2b0 100644
(file)
--- a/
datapath/vport-netdev.c
+++ b/
datapath/vport-netdev.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2007-2012 Nicira
Networks
.
+ * Copyright (c) 2007-2012 Nicira
, Inc
.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@
-273,9
+273,9
@@
static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
ovs_vport_receive(vport, skb);
}
ovs_vport_receive(vport, skb);
}
-static unsigned packet_length(const struct sk_buff *skb)
+static unsigned
int
packet_length(const struct sk_buff *skb)
{
{
- unsigned length = skb->len - ETH_HLEN;
+ unsigned
int
length = skb->len - ETH_HLEN;
if (skb->protocol == htons(ETH_P_8021Q))
length -= VLAN_HLEN;
if (skb->protocol == htons(ETH_P_8021Q))
length -= VLAN_HLEN;
@@
-303,9
+303,9
@@
static int netdev_send(struct vport *vport, struct sk_buff *skb)
int len;
if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {
int len;
if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) {
- if (net_ratelimit())
-
pr_warn("%s: dropped over-mtu packet: %d > %d\n"
,
-
ovs_dp_name(vport->dp),
packet_length(skb), mtu);
+ net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",
+
ovs_dp_name(vport->dp)
,
+
packet_length(skb), mtu);
goto error;
}
goto error;
}