---

yaml --- r: 36756 b: refs/heads/master c: 293b9c4 h: refs/heads/master v: v3
git-mirror · Sep 29, 2006 · 09a0c93 · 09a0c93
1 parent 778157d
commit 09a0c93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c972398b7871d9fb58c6a317786065a7cc6ca4be
+refs/heads/master: 293b9c42511d800b5f7bb2acba50f3e584b8c410
diff --git a/trunk/drivers/usb/host/ohci-hub.c b/trunk/drivers/usb/host/ohci-hub.c
@@ -132,8 +132,6 @@ static inline struct ed *find_head (struct ed *ed)
 	return ed;
 }
 
-static int ohci_restart (struct ohci_hcd *ohci);
-
 /* caller has locked the root hub */
 static int ohci_rh_resume (struct ohci_hcd *ohci)
 __releases(ohci->lock)
@@ -183,6 +181,8 @@ __acquires(ohci->lock)
 #ifdef	CONFIG_PM
 	if (status == -EBUSY) {
 		if (!autostopped) {
+			static int ohci_restart (struct ohci_hcd *ohci);
+
 			spin_unlock_irq (&ohci->lock);
 			(void) ohci_init (ohci);
 			status = ohci_restart (ohci);

diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
@@ -1237,7 +1237,7 @@ static int tcp_v6_rcv(struct sk_buff **pskb)
 
 	skb->dev = NULL;
 
-	bh_lock_sock(sk);
+	bh_lock_sock_nested(sk);
 	ret = 0;
 	if (!sock_owned_by_user(sk)) {
 #ifdef CONFIG_NET_DMA