diff options
| author | Simon Horman <horms@verge.net.au> | 2011-01-12 20:29:21 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-12 20:29:21 -0500 |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /include/net/netns | |
| parent | ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h index 81a31c0db3e7..3419bf5cd154 100644 --- a/include/net/netns/generic.h +++ b/include/net/netns/generic.h | |||
| @@ -30,7 +30,7 @@ struct net_generic { | |||
| 30 | void *ptr[0]; | 30 | void *ptr[0]; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | static inline void *net_generic(struct net *net, int id) | 33 | static inline void *net_generic(const struct net *net, int id) |
| 34 | { | 34 | { |
| 35 | struct net_generic *ng; | 35 | struct net_generic *ng; |
| 36 | void *ptr; | 36 | void *ptr; |