[hurd] 23/28: eth-multiplexer: Fix retrieving status of virtual interfaces.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit fd3b0bc1b318a2cc95ac1f85e308708c4bb8999a
Author: Justus Winter <address@hidden>
Date:   Sat Nov 5 18:05:06 2016 +0100

    eth-multiplexer: Fix retrieving status of virtual interfaces.
    
    Previously, the ethernet multiplexer returned the status of the real
    network device if one was configured.  This had the unfortunate
    consequence that all virtual devices shared the same ethernet address.
    
    * eth-multiplexer/device_impl.c (ds_device_get_status): Always return
    the information for the virtual device.
    * eth-multiplexer/vdev.h (dev_getstat): Add prototype.
---
 eth-multiplexer/device_impl.c | 10 ++--------
 eth-multiplexer/vdev.h        |  5 +++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/eth-multiplexer/device_impl.c b/eth-multiplexer/device_impl.c
index d96fc0f..4796d5b 100644
--- a/eth-multiplexer/device_impl.c
+++ b/eth-multiplexer/device_impl.c
@@ -178,16 +178,10 @@ kern_return_t
 ds_device_get_status (struct vether_device *vdev, dev_flavor_t flavor,
                      dev_status_t status, size_t *statuslen)
 {
-  extern io_return_t dev_getstat (struct vether_device *, dev_flavor_t,
-                                 dev_status_t, natural_t *);
-  kern_return_t ret = 0;
   if (vdev == NULL)
     return D_NO_SUCH_DEVICE;
-  if(ether_port != MACH_PORT_NULL)
-    ret = device_get_status (ether_port, flavor, status, statuslen);
-  else
-    ret = dev_getstat (vdev, flavor, status, statuslen);
-  return ret;
+
+  return dev_getstat (vdev, flavor, status, statuslen);
 }
 
 kern_return_t
diff --git a/eth-multiplexer/vdev.h b/eth-multiplexer/vdev.h
index c869678..c98c441 100644
--- a/eth-multiplexer/vdev.h
+++ b/eth-multiplexer/vdev.h
@@ -76,4 +76,9 @@ int broadcast_msg (struct net_rcv_msg *msg);
 int get_dev_num ();
 int foreach_dev_do (dev_act_func func);
 
+/* dev_stat.c */
+io_return_t dev_getstat (struct vether_device *, dev_flavor_t,
+                         dev_status_t, natural_t *);
+
+
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git