X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_dev.c;h=284a6b520861e506b2d4aeb8c5a3177e8254b9b1;hb=460d80629bc2c7b382f137c968f73ce2be983892;hp=9caf65af7772561b0906b52df478c99a75a0d87b;hpb=baa905d36b831881ceb20686f567dead3ec0bf14;p=openvswitch

diff --git a/datapath/dp_dev.c b/datapath/dp_dev.c
index 9caf65af..284a6b52 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)
 {
@@ -130,6 +129,15 @@ static struct ethtool_ops dp_ethtool_ops = {
 	.get_tso = ethtool_op_get_tso,
 };
 
+static int dp_dev_change_mtu(struct net_device *dev, int new_mtu)
+{
+	if (new_mtu < 68 || new_mtu > dp_min_mtu(dp_dev_get_dp(dev)))
+		return -EINVAL;
+
+	dev->mtu = new_mtu;
+	return 0;
+}
+
 static int dp_dev_init(struct net_device *netdev)
 {
 	struct dp_dev *dp_dev = dp_dev_priv(netdev);
@@ -149,21 +157,47 @@ static void dp_dev_free(struct net_device *netdev)
 	free_netdev(netdev);
 }
 
+static int dp_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+	if (dp_ioctl_hook)
+		return dp_ioctl_hook(dev, ifr, cmd);
+	return -EOPNOTSUPP;
+}
+
+#ifdef HAVE_NET_DEVICE_OPS
+static const struct net_device_ops dp_dev_netdev_ops = {
+	.ndo_init = dp_dev_init,
+	.ndo_open = dp_dev_open,
+	.ndo_stop = dp_dev_stop,
+	.ndo_start_xmit = dp_dev_xmit,
+	.ndo_set_mac_address = dp_dev_mac_addr,
+	.ndo_do_ioctl = dp_dev_do_ioctl,
+	.ndo_change_mtu = dp_dev_change_mtu,
+	.ndo_get_stats = dp_dev_get_stats,
+};
+#endif
+
 static void
 do_setup(struct net_device *netdev)
 {
 	ether_setup(netdev);
 
-	netdev->do_ioctl = dp_ioctl_hook;
+#ifdef HAVE_NET_DEVICE_OPS
+	netdev->netdev_ops = &dp_dev_netdev_ops;
+#else
+	netdev->do_ioctl = dp_dev_do_ioctl;
 	netdev->get_stats = dp_dev_get_stats;
 	netdev->hard_start_xmit = dp_dev_xmit;
 	netdev->open = dp_dev_open;
-	SET_ETHTOOL_OPS(netdev, &dp_ethtool_ops);
 	netdev->stop = dp_dev_stop;
-	netdev->tx_queue_len = 0;
 	netdev->set_mac_address = dp_dev_mac_addr;
+	netdev->change_mtu = dp_dev_change_mtu;
 	netdev->init = dp_dev_init;
+#endif
+
 	netdev->destructor = dp_dev_free;
+	SET_ETHTOOL_OPS(netdev, &dp_ethtool_ops);
+	netdev->tx_queue_len = 0;
 
 	netdev->flags = IFF_BROADCAST | IFF_MULTICAST;
 	netdev->features = NETIF_F_LLTX; /* XXX other features? */
@@ -202,16 +236,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;
 }
 
@@ -223,6 +258,9 @@ void dp_dev_destroy(struct net_device *netdev)
 
 int is_dp_dev(struct net_device *netdev) 
 {
+#ifdef HAVE_NET_DEVICE_OPS
+	return netdev->netdev_ops == &dp_dev_netdev_ops;
+#else
 	return netdev->open == dp_dev_open;
+#endif
 }
-EXPORT_SYMBOL(is_dp_dev);