projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconn: Remove unused "reconnectable" member from vconn.
[openvswitch]
/
datapath
/
dp_dev.c
diff --git
a/datapath/dp_dev.c
b/datapath/dp_dev.c
index d11e7f6f756f4880e8dfbef9616c39ea006b028e..008f3f6ce9593d07db1769546192fe29513db8d2 100644
(file)
--- a/
datapath/dp_dev.c
+++ b/
datapath/dp_dev.c
@@
-118,7
+118,7
@@
static void dp_getinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
{
struct dp_dev *dp_dev = dp_dev_priv(netdev);
strcpy(info->driver, "openvswitch");
{
struct dp_dev *dp_dev = dp_dev_priv(netdev);
strcpy(info->driver, "openvswitch");
- sprintf(info->bus_info, "%d
", dp_dev->dp->dp_idx
);
+ sprintf(info->bus_info, "%d
.%d", dp_dev->dp->dp_idx, dp_dev->port_no
);
}
static struct ethtool_ops dp_ethtool_ops = {
}
static struct ethtool_ops dp_ethtool_ops = {
@@
-211,16
+211,17
@@
struct net_device *dp_dev_create(struct datapath *dp, const char *dp_name, int p
if (!netdev)
return ERR_PTR(-ENOMEM);
if (!netdev)
return ERR_PTR(-ENOMEM);
+ dp_dev = dp_dev_priv(netdev);
+ dp_dev->dp = dp;
+ dp_dev->port_no = port_no;
+ dp_dev->dev = netdev;
+
err = register_netdevice(netdev);
if (err) {
free_netdev(netdev);
return ERR_PTR(err);
}
err = register_netdevice(netdev);
if (err) {
free_netdev(netdev);
return ERR_PTR(err);
}
- dp_dev = dp_dev_priv(netdev);
- dp_dev->dp = dp;
- dp_dev->port_no = port_no;
- dp_dev->dev = netdev;
return netdev;
}
return netdev;
}