From a361b4c6f6e3a2c8e4940798421221dc4aa1e347 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Sat, 20 Nov 2010 18:07:21 +0000
Subject: [PATCH] --- yaml --- r: 224454 b: refs/heads/master c:
 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/net/netns/generic.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be9c9bca22af..a3aaab9f0379 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbce5a59e4e0e6e1dbc85492caaf310ff6611309
+refs/heads/master: 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f
diff --git a/trunk/include/net/netns/generic.h b/trunk/include/net/netns/generic.h
index 81a31c0db3e7..3419bf5cd154 100644
--- a/trunk/include/net/netns/generic.h
+++ b/trunk/include/net/netns/generic.h
@@ -30,7 +30,7 @@ struct net_generic {
 	void *ptr[0];
 };
 
-static inline void *net_generic(struct net *net, int id)
+static inline void *net_generic(const struct net *net, int id)
 {
 	struct net_generic *ng;
 	void *ptr;