projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Make waiting for ovs-vswitchd to reload work again.
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index 84b90b57191a508b33c09d01704a966705101ed8..52bd6ce61cde4e01ad672a4a2b9b678ab8ce1033 100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-37,7
+37,7
@@
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
- struct
odp_vport_stats
vport_stats;
+ struct
rtnl_link_stats64
vport_stats;
vport_get_stats(vport, &vport_stats);
vport_get_stats(vport, &vport_stats);
@@
-148,11
+148,6
@@
static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
return 0;
}
return 0;
}
-static void internal_dev_free(struct net_device *netdev)
-{
- free_netdev(netdev);
-}
-
static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
if (dp_ioctl_hook)
static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
if (dp_ioctl_hook)
@@
-189,7
+184,7
@@
static void do_setup(struct net_device *netdev)
netdev->change_mtu = internal_dev_change_mtu;
#endif
netdev->change_mtu = internal_dev_change_mtu;
#endif
- netdev->destructor =
internal_dev_free
;
+ netdev->destructor =
free_netdev
;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;