[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hurd-commit
Subject:    [SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20120520-603-g7851bb9
From:       "Samuel Thibault" <samuel.thibault () ens-lyon ! org>
Date:       2012-05-20 19:19:37
Message-ID: E1SWBfF-0006E5-6b () vasks ! debian ! org
[Download RAW message or body]

The following commit has been merged in the master branch:
commit 8bb4dceee5d67000e360336082e044615aad346c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun May 20 16:02:52 2012 +0000

    patches/libmachdev.patch: Fix packet delivery on pfinet restart.

diff --git a/debian/changelog b/debian/changelog
index b306403..f98b88a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ hurd (20120520-1) UNRELEASED; urgency=low
   * local/setup-translators:
     - Setup netdde translator and /dev/eth*.
     - Add hd4 and hd5 /dev entries, for some SATA controlers.
-  * debian/hurd.postinst: Migrate pfinet into using /dev/eth0.
+  * hurd.postinst: Migrate pfinet into using /dev/eth0.
+  * patches/libmachdev.patch: Fix packet delivery on pfinet restart.
 
  -- Samuel Thibault <sthibault@debian.org>  Thu, 03 May 2012 01:53:00 +0200
 
diff --git a/debian/patches/libmachdev.patch b/debian/patches/libmachdev.patch
new file mode 100644
index 0000000..864de7e
--- /dev/null
+++ b/debian/patches/libmachdev.patch
@@ -0,0 +1,39 @@
+diff --git a/libmachdev/net.c b/libmachdev/net.c
+index 606765f..a892d1f 100644
+--- a/libmachdev/net.c
++++ b/libmachdev/net.c
+@@ -212,7 +212,7 @@ deliver_msg(struct net_rcv_msg *msg, if_filter_list_t *ifp)
+ 			  MACH_SEND_MSG|MACH_SEND_TIMEOUT,
+ 			  msg->msg_hdr.msgh_size, 0, MACH_PORT_NULL,
+ 			  0, MACH_PORT_NULL);
+-	  if (err != MACH_MSG_SUCCESS)
++	  if (0 && err != MACH_MSG_SUCCESS)
+ 	    {
+ 	      mach_port_deallocate(mach_task_self (),
+ 				   ((mach_msg_header_t *)msg)->msgh_remote_port);
+diff --git a/libbpf/bpf_impl.c b/libbpf/bpf_impl.c
+index b2dafd1..c8a250b 100644
+--- a/libbpf/bpf_impl.c
++++ b/libbpf/bpf_impl.c
+@@ -45,6 +45,8 @@
+ #include "queue.h"
+ #include "util.h"
+ 
++static struct net_hash_header filter_hash_header[N_NET_HASH];
++
+ /*
+  * Execute the filter program starting at pc on the packet p
+  * wirelen is the length of the original packet
+diff --git a/libbpf/bpf_impl.h b/libbpf/bpf_impl.h
+index e611491..9073fda 100644
+--- a/libbpf/bpf_impl.h
++++ b/libbpf/bpf_impl.h
+@@ -134,7 +134,7 @@ struct net_hash_header {
+ 	int n_keys;			/* zero if not used */
+ 	int ref_count;			/* reference count */
+ 	net_hash_entry_t table[NET_HASH_SIZE];
+-} filter_hash_header[N_NET_HASH];
++};
+ 
+ typedef struct net_hash_header *net_hash_header_t;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c4c3db0..767cb79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ libdde_pr_cont.patch
 libdde_fixes.patch
 libdde_rx_queue.patch
 libdde_rcu.patch
+libmachdev.patch

-- 
Debian GNU Hurd packaging

[prev in list] [next in list] [prev in thread] [next in thread]