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
Merge commit '796223f5bc3a4896e6398733c798390158479400'
[sliver-openvswitch.git]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index
a37933d
..
d5060f1
100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-107,6
+107,7
@@
struct dp_netdev_port {
struct list node; /* Element in dp_netdev's 'port_list'. */
struct netdev *netdev;
struct netdev_saved_flags *sf;
struct list node; /* Element in dp_netdev's 'port_list'. */
struct netdev *netdev;
struct netdev_saved_flags *sf;
+ struct netdev_rx *rx;
char *type; /* Port type as requested by user. */
};
char *type; /* Port type as requested by user. */
};
@@
-386,6
+387,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
struct netdev_saved_flags *sf;
struct dp_netdev_port *port;
struct netdev *netdev;
struct netdev_saved_flags *sf;
struct dp_netdev_port *port;
struct netdev *netdev;
+ struct netdev_rx *rx;
const char *open_type;
int mtu;
int error;
const char *open_type;
int mtu;
int error;
@@
-401,7
+403,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
/* XXX reject loopback devices */
/* XXX reject non-Ethernet devices */
/* XXX reject loopback devices */
/* XXX reject non-Ethernet devices */
- error = netdev_
listen(netdev
);
+ error = netdev_
rx_open(netdev, &rx
);
if (error
&& !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) {
VLOG_ERR("%s: cannot receive packets on this network device (%s)",
if (error
&& !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) {
VLOG_ERR("%s: cannot receive packets on this network device (%s)",
@@
-412,6
+414,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf);
if (error) {
error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf);
if (error) {
+ netdev_rx_close(rx);
netdev_close(netdev);
return error;
}
netdev_close(netdev);
return error;
}
@@
-420,6
+423,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
port->port_no = port_no;
port->netdev = netdev;
port->sf = sf;
port->port_no = port_no;
port->netdev = netdev;
port->sf = sf;
+ port->rx = rx;
port->type = xstrdup(type);
error = netdev_get_mtu(netdev, &mtu);
port->type = xstrdup(type);
error = netdev_get_mtu(netdev, &mtu);
@@
-517,6
+521,7
@@
do_del_port(struct dp_netdev *dp, uint32_t port_no)
netdev_close(port->netdev);
netdev_restore_flags(port->sf);
netdev_close(port->netdev);
netdev_restore_flags(port->sf);
+ netdev_rx_close(port->rx);
free(port->type);
free(port);
free(port->type);
free(port);
@@
-1071,7
+1076,7
@@
dpif_netdev_run(struct dpif *dpif)
ofpbuf_clear(&packet);
ofpbuf_reserve(&packet, DP_NETDEV_HEADROOM);
ofpbuf_clear(&packet);
ofpbuf_reserve(&packet, DP_NETDEV_HEADROOM);
- error =
netdev_recv(port->netdev, &packet)
;
+ error =
port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP
;
if (!error) {
dp_netdev_port_input(dp, port, &packet);
} else if (error != EAGAIN && error != EOPNOTSUPP) {
if (!error) {
dp_netdev_port_input(dp, port, &packet);
} else if (error != EAGAIN && error != EOPNOTSUPP) {
@@
-1091,7
+1096,9
@@
dpif_netdev_wait(struct dpif *dpif)
struct dp_netdev_port *port;
LIST_FOR_EACH (port, node, &dp->port_list) {
struct dp_netdev_port *port;
LIST_FOR_EACH (port, node, &dp->port_list) {
- netdev_recv_wait(port->netdev);
+ if (port->rx) {
+ netdev_rx_wait(port->rx);
+ }
}
}
}
}