diff options
| -rw-r--r-- | debian/patches/fix-net_rcv_msg.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | libmachdev/net.c | 6 |
3 files changed, 4 insertions, 22 deletions
diff --git a/debian/patches/fix-net_rcv_msg.patch b/debian/patches/fix-net_rcv_msg.patch deleted file mode 100644 index 6f0c8ac0..00000000 --- a/debian/patches/fix-net_rcv_msg.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libmachdev/net.c b/libmachdev/net.c -index 07bb74a..e04b558 100644 ---- a/libmachdev/net.c -+++ b/libmachdev/net.c -@@ -243,8 +243,10 @@ netif_rx_handle (char *data, int len, struct net_device *dev) - - pack_size = len - sizeof (struct ethhdr); - /* remember message sizes must be rounded up */ -- net_msg->msg_hdr.msgh_size = (((mach_msg_size_t) (sizeof(struct net_rcv_msg) -- - NET_RCV_MAX + pack_size)) + 3) & ~3; -+ 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. */ - eh = (struct ether_header *) (net_msg->header); diff --git a/debian/patches/series b/debian/patches/series index 37f91a74..7b5dce8f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -58,6 +58,3 @@ mount-bind.patch xkb-compat.patch mach-defpager-protected-payload.patch - -# This is in libmachdev, has been applied in hurd-dde -fix-net_rcv_msg.patch diff --git a/libmachdev/net.c b/libmachdev/net.c index 07bb74a9..e04b5584 100644 --- a/libmachdev/net.c +++ b/libmachdev/net.c @@ -243,8 +243,10 @@ netif_rx_handle (char *data, int len, struct net_device *dev) pack_size = len - sizeof (struct ethhdr); /* remember message sizes must be rounded up */ - net_msg->msg_hdr.msgh_size = (((mach_msg_size_t) (sizeof(struct net_rcv_msg) - - NET_RCV_MAX + pack_size)) + 3) & ~3; + 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. */ eh = (struct ether_header *) (net_msg->header); |