X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fdp_dev.c;h=008f3f6ce9593d07db1769546192fe29513db8d2;hb=85ab0a021523e51435539af0e6a138c73c9846a2;hp=422af0205d55466f2483f7799c93f9a09bd2657b;hpb=1dcf111b1cb66fe1f3ed2e45f66ab6f5659a6527;p=openvswitch diff --git a/datapath/dp_dev.c b/datapath/dp_dev.c index 422af020..008f3f6c 100644 --- a/datapath/dp_dev.c +++ b/datapath/dp_dev.c @@ -28,7 +28,6 @@ struct datapath *dp_dev_get_dp(struct net_device *netdev) { return dp_dev_priv(netdev)->dp; } -EXPORT_SYMBOL(dp_dev_get_dp); static struct net_device_stats *dp_dev_get_stats(struct net_device *netdev) { @@ -119,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"); - 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 = { @@ -212,16 +211,17 @@ struct net_device *dp_dev_create(struct datapath *dp, const char *dp_name, int p 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); } - dp_dev = dp_dev_priv(netdev); - dp_dev->dp = dp; - dp_dev->port_no = port_no; - dp_dev->dev = netdev; return netdev; } @@ -235,4 +235,3 @@ int is_dp_dev(struct net_device *netdev) { return netdev->open == dp_dev_open; } -EXPORT_SYMBOL(is_dp_dev);