diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/flow.c | 2 | ||||
-rw-r--r-- | net/core/skbuff.c | 8 | ||||
-rw-r--r-- | net/core/sock.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index 5df3e297f817..104c25d00a1d 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -44,7 +44,7 @@ static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL }; | |||
44 | 44 | ||
45 | #define flow_table(cpu) (per_cpu(flow_tables, cpu)) | 45 | #define flow_table(cpu) (per_cpu(flow_tables, cpu)) |
46 | 46 | ||
47 | static kmem_cache_t *flow_cachep __read_mostly; | 47 | static struct kmem_cache *flow_cachep __read_mostly; |
48 | 48 | ||
49 | static int flow_lwm, flow_hwm; | 49 | static int flow_lwm, flow_hwm; |
50 | 50 | ||
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7217fb8928f2..de7801d589e7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -68,8 +68,8 @@ | |||
68 | 68 | ||
69 | #include "kmap_skb.h" | 69 | #include "kmap_skb.h" |
70 | 70 | ||
71 | static kmem_cache_t *skbuff_head_cache __read_mostly; | 71 | static struct kmem_cache *skbuff_head_cache __read_mostly; |
72 | static kmem_cache_t *skbuff_fclone_cache __read_mostly; | 72 | static struct kmem_cache *skbuff_fclone_cache __read_mostly; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * Keep out-of-line to prevent kernel bloat. | 75 | * Keep out-of-line to prevent kernel bloat. |
@@ -144,7 +144,7 @@ EXPORT_SYMBOL(skb_truesize_bug); | |||
144 | struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, | 144 | struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, |
145 | int fclone, int node) | 145 | int fclone, int node) |
146 | { | 146 | { |
147 | kmem_cache_t *cache; | 147 | struct kmem_cache *cache; |
148 | struct skb_shared_info *shinfo; | 148 | struct skb_shared_info *shinfo; |
149 | struct sk_buff *skb; | 149 | struct sk_buff *skb; |
150 | u8 *data; | 150 | u8 *data; |
@@ -211,7 +211,7 @@ nodata: | |||
211 | * Buffers may only be allocated from interrupts using a @gfp_mask of | 211 | * Buffers may only be allocated from interrupts using a @gfp_mask of |
212 | * %GFP_ATOMIC. | 212 | * %GFP_ATOMIC. |
213 | */ | 213 | */ |
214 | struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp, | 214 | struct sk_buff *alloc_skb_from_cache(struct kmem_cache *cp, |
215 | unsigned int size, | 215 | unsigned int size, |
216 | gfp_t gfp_mask) | 216 | gfp_t gfp_mask) |
217 | { | 217 | { |
diff --git a/net/core/sock.c b/net/core/sock.c index 419c7d3289c7..4a432da441e9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -841,7 +841,7 @@ struct sock *sk_alloc(int family, gfp_t priority, | |||
841 | struct proto *prot, int zero_it) | 841 | struct proto *prot, int zero_it) |
842 | { | 842 | { |
843 | struct sock *sk = NULL; | 843 | struct sock *sk = NULL; |
844 | kmem_cache_t *slab = prot->slab; | 844 | struct kmem_cache *slab = prot->slab; |
845 | 845 | ||
846 | if (slab != NULL) | 846 | if (slab != NULL) |
847 | sk = kmem_cache_alloc(slab, priority); | 847 | sk = kmem_cache_alloc(slab, priority); |