From 9ac11873fefccf1bca244d8534432758d3cde565 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sun, 31 Dec 2006 14:24:58 -0800
Subject: [PATCH] --- yaml --- r: 45160 b: refs/heads/master c:
 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/net.h       | 2 +-
 trunk/include/linux/netdevice.h | 1 +
 trunk/net/xfrm/xfrm_algo.c      | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5162e43b9fc6..fb1afeb387aa 100644
--- 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
index 6f0dfeba509a..f28d8a2e2c91 100644
--- 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
index 6be767c76b37..fea0d9db6846 100644
--- 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
index 6b381fc0383d..f1cf3402e75c 100644
--- 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;