summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRami Rosen <rosenr@marvell.com>2012-08-23 02:55:41 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-23 09:29:45 -0700
commitf63c45e0e63fd1bccb6d021fe4de20f82114a024 (patch)
treecf77ba24a9ddac69f962f9f18ba2fff4c9fae5a2
parent748e2d9396a18c3fd3d07d47c1b41320acf1fbf4 (diff)
downloadblackbird-op-linux-f63c45e0e63fd1bccb6d021fe4de20f82114a024.tar.gz
blackbird-op-linux-f63c45e0e63fd1bccb6d021fe4de20f82114a024.zip
packet: fix broken build.
This patch fixes a broken build due to a missing header: ... CC net/ipv4/proc.o In file included from include/net/net_namespace.h:15, from net/ipv4/proc.c:35: include/net/netns/packet.h:11: error: field 'sklist_lock' has incomplete type ... The lock of netns_packet has been replaced by a recent patch to be a mutex instead of a spinlock, but we need to replace the header file to be linux/mutex.h instead of linux/spinlock.h as well. See commit 0fa7fa98dbcc2789409ed24e885485e645803d7f: packet: Protect packet sk list with mutex (v2) patch, Signed-off-by: Rami Rosen <rosenr@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/netns/packet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/packet.h b/include/net/netns/packet.h
index 4780b080a436..17ec2b95c062 100644
--- a/include/net/netns/packet.h
+++ b/include/net/netns/packet.h
@@ -5,7 +5,7 @@
#define __NETNS_PACKET_H__
#include <linux/rculist.h>
-#include <linux/spinlock.h>
+#include <linux/mutex.h>
struct netns_packet {
struct mutex sklist_lock;
OpenPOWER on IntegriCloud