X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_dev.c;h=2bbd6fecf8d05a52f851b3562b2ad9663a1fbff8;hb=c6278d208924bb04c41266ddca276712f95533bc;hp=b0ba3017a2cdf35d5ec165e49ff63becf1c989c9;hpb=b78a7336a3318a3c348004760bac3e0057b9e9d1;p=openvswitch

diff --git a/datapath/dp_dev.c b/datapath/dp_dev.c
index b0ba3017..2bbd6fec 100644
--- a/datapath/dp_dev.c
+++ b/datapath/dp_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/preempt.h>
 #include <linux/rcupdate.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
@@ -62,9 +63,13 @@ int dp_dev_recv(struct net_device *netdev, struct sk_buff *skb)
 	else
 		netif_rx_ni(skb);
 	netdev->last_rx = jiffies;
+
+	preempt_disable();
 	lb_stats = per_cpu_ptr(dp_dev->lstats, smp_processor_id());
 	lb_stats->rx_packets++;
 	lb_stats->rx_bytes += len;
+	preempt_enable();
+
 	return len;
 }
 
@@ -118,7 +123,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 = {
@@ -157,22 +162,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? */
@@ -184,8 +214,8 @@ do_setup(struct net_device *netdev)
 	netdev->dev_addr[1] = 0x23;
 	netdev->dev_addr[2] = 0x20;
 
-	/* Set the top bits to indicate random Nicira address. */
-	netdev->dev_addr[3] |= 0xc0;
+	/* Set the top bit to indicate random Nicira address. */
+	netdev->dev_addr[3] |= 0x80;
 }
 
 /* Create a datapath device associated with 'dp'.  If 'dp_name' is null,
@@ -233,5 +263,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
 }