mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[INET]: Consolidate xxx_frag_create()
This one uses the xxx_frag_intern() and xxx_frag_alloc() routines, which are already consolidated, so remove them from protocol code (as promised). The ->constructor callback is used to init the rest of the frag queue and it is the same for netfilter and ipv6. Signed-off-by: Pavel Emelyanov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
e521db9d79
commit
c6fda28229
6 changed files with 88 additions and 85 deletions
|
|
@ -39,6 +39,8 @@ struct inet_frags {
|
|||
struct inet_frags_ctl *ctl;
|
||||
|
||||
unsigned int (*hashfn)(struct inet_frag_queue *);
|
||||
void (*constructor)(struct inet_frag_queue *q,
|
||||
void *arg);
|
||||
void (*destructor)(struct inet_frag_queue *);
|
||||
void (*skb_free)(struct sk_buff *);
|
||||
int (*equal)(struct inet_frag_queue *q1,
|
||||
|
|
@ -53,9 +55,8 @@ void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
|
|||
void inet_frag_destroy(struct inet_frag_queue *q,
|
||||
struct inet_frags *f, int *work);
|
||||
int inet_frag_evictor(struct inet_frags *f);
|
||||
struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *q,
|
||||
struct inet_frags *f, unsigned int hash);
|
||||
struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f);
|
||||
struct inet_frag_queue *inet_frag_create(struct inet_frags *f,
|
||||
void *create_arg, unsigned int hash);
|
||||
|
||||
static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -380,6 +380,14 @@ static inline int ipv6_prefix_equal(const struct in6_addr *a1,
|
|||
struct inet_frag_queue;
|
||||
int ip6_frag_equal(struct inet_frag_queue *q1, struct inet_frag_queue *q2);
|
||||
|
||||
struct ip6_create_arg {
|
||||
__be32 id;
|
||||
struct in6_addr *src;
|
||||
struct in6_addr *dst;
|
||||
};
|
||||
|
||||
void ip6_frag_init(struct inet_frag_queue *q, void *a);
|
||||
|
||||
static inline int ipv6_addr_any(const struct in6_addr *a)
|
||||
{
|
||||
return ((a->s6_addr32[0] | a->s6_addr32[1] |
|
||||
|
|
|
|||
Loading…
Reference in a new issue