sync libmachdev

5 files changed, 1 insertions, 61 deletions

diff --git a/debian/patches/series b/debian/patches/series
index 310aec24..b0f3b56f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -76,4 +76,3 @@ libmachdev-remove-static-linking-hack.patch
 0026-hurd-add-intranpayload-functions-to-all-hurd-types.patch
 0027-libports-use-protected-payloads-to-optimize-the-obje.patch
 0028-libports-Fix-build.patch
-undo_net_size_fix.patch
diff --git a/debian/patches/undo_net_size_fix.patch b/debian/patches/undo_net_size_fix.patch
deleted file mode 100644
index 47c5e54d..00000000
--- a/debian/patches/undo_net_size_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libmachdev/net.c b/libmachdev/net.c
-index 53edcd0..ea56b8b 100644
---- a/libmachdev/net.c
-+++ b/libmachdev/net.c
-@@ -245,7 +245,6 @@ netif_rx_handle (char *data, int len, struct net_device *dev)
-   /* remember message sizes must be rounded up */
-   net_msg->msg_hdr.msgh_size =
-     (((mach_msg_size_t) (sizeof (struct net_rcv_msg)
--			 - sizeof net_msg->sent
- 			 - NET_RCV_MAX + pack_size)) + 3) & ~3;
- 
-   /* Copy packet into message buffer.  */
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index a47bf325..345c004f 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -31,6 +31,3 @@ OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 
 include ../Makeconf
-
-$(libname).so.$(hurd-version):
-	echo "INPUT ( $(libname).a )" > $@
diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
index 6bd5a129..e9fbe944 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdev/ds_routines.c
@@ -87,52 +87,7 @@ boolean_t is_master_device (mach_port_t port);
  * What follows is the interface for the native Mach devices.
  */
 
-static inline mach_port_t
-mach_convert_device_to_port (mach_device_t device)
-{
-  if (device == NULL)
-    return MACH_PORT_NULL;
-
-  // TODO I have to somehow dereference it when it is called at the first time.
-  return ports_get_right (device);
-}
-
 /* Implementation of device interface */
-kern_return_t 
-ds_xxx_device_set_status (struct mach_device *device, dev_flavor_t flavor,
-			  dev_status_t status, size_t statu_cnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (struct mach_device *device, dev_flavor_t flavor,
-			  dev_status_t status, size_t *statuscnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (struct mach_device *device, mach_port_t rec,
-			  int pri, filter_array_t filt, size_t len)
-{
-  return D_INVALID_OPERATION;
-}
-
-io_return_t
-ds_device_intr_register (mach_port_t master_port, int irq,
-			 int flags, int id, mach_port_t receive_port)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_intr_enable (mach_port_t master_port,
-		       int line, char status)
-{
-  return D_INVALID_OPERATION;
-}
-
 io_return_t
 ds_device_open (mach_port_t open_port, mach_port_t reply_port,
 		mach_msg_type_name_t reply_port_type, dev_mode_t mode,
diff --git a/libmachdev/net.c b/libmachdev/net.c
index 7ddf95d9..47e85aac 100644
--- a/libmachdev/net.c
+++ b/libmachdev/net.c
@@ -239,6 +239,7 @@ netif_rx_handle (char *data, int len, struct net_device *dev)
   net_msg->msg_hdr.msgh_size =
     (((mach_msg_size_t) (sizeof (struct net_rcv_msg)
 			 - sizeof net_msg->sent
+			 + sizeof (struct packet_header)
 			 - NET_RCV_MAX + pack_size)) + 3) & ~3;
 
   /* Copy packet into message buffer.  */