---

yaml --- r: 45160 b: refs/heads/master c: 9d572ec h: refs/heads/master v: v3
git-mirror · Dec 31, 2006 · 9ac1187 · 9ac1187
1 parent 2b15587
commit 9ac1187
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4060c0dbbe9ad7b8c0aeefa142398c8d3468bac
+refs/heads/master: 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
@@ -19,7 +19,6 @@
 #define _LINUX_NET_H
 
 #include <linux/wait.h>
-#include <linux/random.h>
 #include <asm/socket.h>
 
 struct poll_table_struct;
@@ -57,6 +56,7 @@ typedef enum {
 
 #ifdef __KERNEL__
 #include <linux/stringify.h>
+#include <linux/random.h>
 
 #define SOCK_ASYNC_NOSPACE	0
 #define SOCK_ASYNC_WAITDATA	1

diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -906,6 +906,7 @@ static inline void netif_poll_disable(struct net_device *dev)
 
 static inline void netif_poll_enable(struct net_device *dev)
 {
+	smp_mb__before_clear_bit();
 	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
 }
 

diff --git a/trunk/net/xfrm/xfrm_algo.c b/trunk/net/xfrm/xfrm_algo.c
@@ -399,7 +399,8 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
 		if (!probe)
 			break;
 
-		status = crypto_has_alg(name, type, mask | CRYPTO_ALG_ASYNC);
+		status = crypto_has_alg(list[i].name, type,
+					mask | CRYPTO_ALG_ASYNC);
 		if (!status)
 			break;
-Original file line number
+Diff line change
@@ Expand Up @@
     static inline void netif_poll_enable(struct net_device *dev)
     {
+    	smp_mb__before_clear_bit();
     	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
     }
@@ Expand Down @@