| Message ID | 309002C0DA137042828828FC53D7A934012B21B8CCCE@IL-MB01.marvell.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Rami Rosen <rosenr@marvell.com> Date: Thu, 23 Aug 2012 15:55:41 +0300 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/netns/packet.h b/include/net/netns/packet.h index 4780b08..17ec2b9 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;
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>