mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "YOSHIFUJI Hideaki / 吉藤英明" <yoshfuji@linux-ipv6.org>
To: dmlb2000@gmail.com, mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, yoshfuji@linux-ipv6.org
Subject: Re: 2.6.15-rt1
Date: Tue, 03 Jan 2006 20:24:22 -0600 (CST)	[thread overview]
Message-ID: <20060103.202422.50699198.yoshfuji@linux-ipv6.org> (raw)
In-Reply-To: <9c21eeae0601031512m44c4a269ua2214528eaf90914@mail.gmail.com>

Hello.

In article <9c21eeae0601031512m44c4a269ua2214528eaf90914@mail.gmail.com> (at Tue, 3 Jan 2006 15:12:50 -0800), David Brown <dmlb2000@gmail.com> says:

>   CC [M]  net/ipv6/icmp.o
>   CC [M]  net/ipv6/mcast.o
> net/ipv6/mcast.c: In function `ipv6_sock_mc_join':
> net/ipv6/mcast.c:227: error: `RW_LOCK_UNLOCKED' undeclared (first use
> in this function)
> net/ipv6/mcast.c:227: error: (Each undeclared identifier is reported only once
> net/ipv6/mcast.c:227: error: for each function it appears in.)
> make[2]: *** [net/ipv6/mcast.o] Error 1
> make[1]: *** [net/ipv6] Error 2
> make: *** [net] Error 2

This patch should fix compilation issues in net/ipv6 subsystem
w/ rt patch.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index f829a4a..15264f4 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -224,7 +224,7 @@ int ipv6_sock_mc_join(struct sock *sk, i
 
 	mc_lst->ifindex = dev->ifindex;
 	mc_lst->sfmode = MCAST_EXCLUDE;
-	mc_lst->sflock = RW_LOCK_UNLOCKED;
+	mc_lst->sflock = RW_LOCK_UNLOCKED(mc_lst->sflock);
 	mc_lst->sflist = NULL;
 
 	/*
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index c2c52af..bfd7a2b 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -98,7 +98,7 @@ struct nf_ct_frag6_queue
 #define FRAG6Q_HASHSZ	64
 
 static struct nf_ct_frag6_queue *nf_ct_frag6_hash[FRAG6Q_HASHSZ];
-static rwlock_t nf_ct_frag6_lock = RW_LOCK_UNLOCKED;
+static rwlock_t nf_ct_frag6_lock = RW_LOCK_UNLOCKED(nf_ct_frag6_lock);
 static u32 nf_ct_frag6_hash_rnd;
 static LIST_HEAD(nf_ct_frag6_lru_list);
 int nf_ct_frag6_nqueues = 0;
@@ -371,7 +371,7 @@ nf_ct_frag6_create(unsigned int hash, u3
 	init_timer(&fq->timer);
 	fq->timer.function = nf_ct_frag6_expire;
 	fq->timer.data = (long) fq;
-	fq->lock = SPIN_LOCK_UNLOCKED;
+	fq->lock = SPIN_LOCK_UNLOCKED(fq->lock);
 	atomic_set(&fq->refcnt, 1);
 
 	return nf_ct_frag6_intern(hash, fq);

-- 
YOSHIFUJI Hideaki @ USAGI Project  <yoshfuji@linux-ipv6.org>
GPG-FP  : 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

  parent reply	other threads:[~2006-01-04  2:23 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-03  9:47 2.6.15-rt1 Ingo Molnar
2006-01-03 11:21 ` 2.6.15-rt1 Michal Piotrowski
2006-01-03 11:27   ` 2.6.15-rt1 Ingo Molnar
2006-01-03 11:34     ` 2.6.15-rt1 Michal Piotrowski
2006-01-03 14:33 ` 2.6.15-rt1 Florian Schmidt
2006-01-03 15:13   ` 2.6.15-rt1 Florian Schmidt
2006-01-03 18:40     ` 2.6.15-rt1 Steven Rostedt
2006-01-03 18:56       ` 2.6.15-rt1 Steven Rostedt
2006-01-04  0:01         ` 2.6.15-rt1 Florian Schmidt
2006-01-04  0:24           ` 2.6.15-rt1 Steven Rostedt
2006-01-04 14:31             ` 2.6.15-rt1 Steven Rostedt
2006-01-03 23:12 ` 2.6.15-rt1 David Brown
2006-01-03 23:29   ` 2.6.15-rt1 David Brown
2006-01-04  2:24   ` YOSHIFUJI Hideaki / 吉藤英明 [this message]
2006-01-04  7:16     ` 2.6.15-rt1 David Brown
2006-01-04  7:43       ` 2.6.15-rt1 YOSHIFUJI Hideaki / 吉藤英明
2006-01-04  7:50         ` 2.6.15-rt1 David Brown
2006-01-04 21:01           ` 2.6.15-rt1 Willy Tarreau
2006-01-05 20:52 ` 2.6.15-rt1 James Cloos
2006-01-05 21:00   ` 2.6.15-rt1 David Brown
2006-01-10 22:17 ` 2.6.15-rt1 Esben Stien
2006-01-11  3:09   ` 2.6.15-rt1 Steven Rostedt
2006-01-11 10:16 ` 2.6.15-rt1 Esben Stien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060103.202422.50699198.yoshfuji@linux-ipv6.org \
    --to=yoshfuji@linux-ipv6.org \
    --cc=dmlb2000@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®