[NETFILTER]: nf_conntrack: reorder struct nf_conntrack_l4proto
Reorder struct nf_conntrack_l4proto so all members used during packet processing are in the same cacheline. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0794935e21
commit
ffaa9c100b
|
@ -23,9 +23,6 @@ struct nf_conntrack_l4proto
|
||||||
/* L4 Protocol number. */
|
/* L4 Protocol number. */
|
||||||
u_int8_t l4proto;
|
u_int8_t l4proto;
|
||||||
|
|
||||||
/* Protocol name */
|
|
||||||
const char *name;
|
|
||||||
|
|
||||||
/* Try to fill in the third arg: dataoff is offset past network protocol
|
/* Try to fill in the third arg: dataoff is offset past network protocol
|
||||||
hdr. Return true if possible. */
|
hdr. Return true if possible. */
|
||||||
int (*pkt_to_tuple)(const struct sk_buff *skb,
|
int (*pkt_to_tuple)(const struct sk_buff *skb,
|
||||||
|
@ -38,13 +35,6 @@ struct nf_conntrack_l4proto
|
||||||
int (*invert_tuple)(struct nf_conntrack_tuple *inverse,
|
int (*invert_tuple)(struct nf_conntrack_tuple *inverse,
|
||||||
const struct nf_conntrack_tuple *orig);
|
const struct nf_conntrack_tuple *orig);
|
||||||
|
|
||||||
/* Print out the per-protocol part of the tuple. Return like seq_* */
|
|
||||||
int (*print_tuple)(struct seq_file *s,
|
|
||||||
const struct nf_conntrack_tuple *);
|
|
||||||
|
|
||||||
/* Print out the private part of the conntrack. */
|
|
||||||
int (*print_conntrack)(struct seq_file *s, const struct nf_conn *);
|
|
||||||
|
|
||||||
/* Returns verdict for packet, or -1 for invalid. */
|
/* Returns verdict for packet, or -1 for invalid. */
|
||||||
int (*packet)(struct nf_conn *conntrack,
|
int (*packet)(struct nf_conn *conntrack,
|
||||||
const struct sk_buff *skb,
|
const struct sk_buff *skb,
|
||||||
|
@ -65,6 +55,13 @@ struct nf_conntrack_l4proto
|
||||||
enum ip_conntrack_info *ctinfo,
|
enum ip_conntrack_info *ctinfo,
|
||||||
int pf, unsigned int hooknum);
|
int pf, unsigned int hooknum);
|
||||||
|
|
||||||
|
/* Print out the per-protocol part of the tuple. Return like seq_* */
|
||||||
|
int (*print_tuple)(struct seq_file *s,
|
||||||
|
const struct nf_conntrack_tuple *);
|
||||||
|
|
||||||
|
/* Print out the private part of the conntrack. */
|
||||||
|
int (*print_conntrack)(struct seq_file *s, const struct nf_conn *);
|
||||||
|
|
||||||
/* convert protoinfo to nfnetink attributes */
|
/* convert protoinfo to nfnetink attributes */
|
||||||
int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
|
int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
|
||||||
const struct nf_conn *ct);
|
const struct nf_conn *ct);
|
||||||
|
@ -87,6 +84,8 @@ struct nf_conntrack_l4proto
|
||||||
struct ctl_table *ctl_compat_table;
|
struct ctl_table *ctl_compat_table;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
/* Protocol name */
|
||||||
|
const char *name;
|
||||||
|
|
||||||
/* Module (if any) which this is connected to. */
|
/* Module (if any) which this is connected to. */
|
||||||
struct module *me;
|
struct module *me;
|
||||||
|
|
Loading…
Reference in New Issue