module build: depend on make, now that it's optional in pam

[packages/kernel.git] / kernel-layer7.patch

diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index 1c9aa8e9774067a35967dff2a12a167fbd2cb0d7..a390ab2312db53cdadfb6591e17d94ed72eab406 100644 (file)
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2061,9 +2061,9 @@
 +      #endif
 +
 +
-       /* We overload first tuple to link into unconfirmed list. */
-       if (!nf_ct_is_confirmed(ct)) {
-               BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
+       /* We overload first tuple to link into unconfirmed or dying list.*/
+       BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+       hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
 --- linux-2.6.28-stock/net/netfilter/nf_conntrack_standalone.c 2009-01-07 16:05:35.000000000 -0600
 +++ linux-2.6.28/net/netfilter/nf_conntrack_standalone.c       2009-01-07 16:07:31.000000000 -0600
 @@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file *