From 436cefe718fa9311d415eda87d3dc0fc1093e737 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Mon, 15 Nov 2010 06:38:12 +0000
Subject: [PATCH] --- yaml --- r: 224182 b: refs/heads/master c:
 61391cde9eefac5cfcf6d214aa80c77e58b1626b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 80fdd2087cb5..c69a33c91a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a386f99025f13b32502fe5dedf223c20d7283826
+refs/heads/master: 61391cde9eefac5cfcf6d214aa80c77e58b1626b
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index fccb11f879e5..b45c1b8b1d19 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -994,8 +994,8 @@ struct net_device {
 	unsigned int		real_num_rx_queues;
 #endif
 
-	rx_handler_func_t	*rx_handler;
-	void			*rx_handler_data;
+	rx_handler_func_t __rcu	*rx_handler;
+	void __rcu		*rx_handler_data;
 
 	struct netdev_queue __rcu *ingress_queue;