aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_vs.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 5700b07b5186..929e04c6b82e 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -566,20 +566,19 @@ struct ip_vs_conn_param {
566 */ 566 */
567struct ip_vs_conn { 567struct ip_vs_conn {
568 struct hlist_node c_list; /* hashed list heads */ 568 struct hlist_node c_list; /* hashed list heads */
569#ifdef CONFIG_NET_NS
570 struct net *net; /* Name space */
571#endif
572 /* Protocol, addresses and port numbers */ 569 /* Protocol, addresses and port numbers */
573 u16 af; /* address family */
574 __be16 cport; 570 __be16 cport;
575 __be16 vport;
576 __be16 dport; 571 __be16 dport;
577 __u32 fwmark; /* Fire wall mark from skb */ 572 __be16 vport;
573 u16 af; /* address family */
578 union nf_inet_addr caddr; /* client address */ 574 union nf_inet_addr caddr; /* client address */
579 union nf_inet_addr vaddr; /* virtual address */ 575 union nf_inet_addr vaddr; /* virtual address */
580 union nf_inet_addr daddr; /* destination address */ 576 union nf_inet_addr daddr; /* destination address */
581 volatile __u32 flags; /* status flags */ 577 volatile __u32 flags; /* status flags */
582 __u16 protocol; /* Which protocol (TCP/UDP) */ 578 __u16 protocol; /* Which protocol (TCP/UDP) */
579#ifdef CONFIG_NET_NS
580 struct net *net; /* Name space */
581#endif
583 582
584 /* counter and timer */ 583 /* counter and timer */
585 atomic_t refcnt; /* reference count */ 584 atomic_t refcnt; /* reference count */
@@ -593,6 +592,7 @@ struct ip_vs_conn {
593 * state transition triggerd 592 * state transition triggerd
594 * synchronization 593 * synchronization
595 */ 594 */
595 __u32 fwmark; /* Fire wall mark from skb */
596 unsigned long sync_endtime; /* jiffies + sent_retries */ 596 unsigned long sync_endtime; /* jiffies + sent_retries */
597 597
598 /* Control members */ 598 /* Control members */