git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vswitchd: Document behavior of 802.1p priorities with VLAN splinters.
[sliver-openvswitch.git]
/
lib
/
netdev-linux.c
diff --git
a/lib/netdev-linux.c
b/lib/netdev-linux.c
index
a100898
..
19a80fb
100644
(file)
--- a/
lib/netdev-linux.c
+++ b/
lib/netdev-linux.c
@@
-802,9
+802,9
@@
netdev_linux_recv(struct netdev *netdev_, void *data, size_t size)
}
for (;;) {
}
for (;;) {
- ssize_t retval = re
ad(netdev->fd, data, size
);
+ ssize_t retval = re
cv(netdev->fd, data, size, MSG_TRUNC
);
if (retval >= 0) {
if (retval >= 0) {
- return retval;
+ return retval
<= size ? retval : -EMSGSIZE
;
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s",
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s",
@@
-1244,8
+1244,8
@@
get_stats_via_vport(const struct netdev *netdev_,
error = netdev_vport_get_stats(netdev_, stats);
if (error) {
error = netdev_vport_get_stats(netdev_, stats);
if (error) {
- VLOG_WARN_RL(&rl, "%s: obtaining netdev stats via vport failed
%d",
-
netdev_get_name(netdev_), error
);
+ VLOG_WARN_RL(&rl, "%s: obtaining netdev stats via vport failed
"
+
"(%s)", netdev_get_name(netdev_), strerror(error)
);
}
netdev_dev->have_vport_stats = !error;
netdev_dev->cache_valid |= VALID_HAVE_VPORT_STATS;
}
netdev_dev->have_vport_stats = !error;
netdev_dev->cache_valid |= VALID_HAVE_VPORT_STATS;