Messages in this thread Patch in this message | | | Date | Tue, 03 Jan 2006 20:24:22 -0600 (CST) | Subject | Re: 2.6.15-rt1 | From | YOSHIFUJI Hideaki / 吉藤英明 <> |
| |
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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |