diff options
Diffstat (limited to 'net/openvswitch/conntrack.c')
| -rw-r--r-- | net/openvswitch/conntrack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index c5904f629091..02fc343feb66 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c | |||
| @@ -72,7 +72,7 @@ struct ovs_conntrack_info { | |||
| 72 | struct md_mark mark; | 72 | struct md_mark mark; |
| 73 | struct md_labels labels; | 73 | struct md_labels labels; |
| 74 | #ifdef CONFIG_NF_NAT_NEEDED | 74 | #ifdef CONFIG_NF_NAT_NEEDED |
| 75 | struct nf_nat_range range; /* Only present for SRC NAT and DST NAT. */ | 75 | struct nf_nat_range2 range; /* Only present for SRC NAT and DST NAT. */ |
| 76 | #endif | 76 | #endif |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| @@ -710,7 +710,7 @@ static bool skb_nfct_cached(struct net *net, | |||
| 710 | */ | 710 | */ |
| 711 | static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct, | 711 | static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct, |
| 712 | enum ip_conntrack_info ctinfo, | 712 | enum ip_conntrack_info ctinfo, |
| 713 | const struct nf_nat_range *range, | 713 | const struct nf_nat_range2 *range, |
| 714 | enum nf_nat_manip_type maniptype) | 714 | enum nf_nat_manip_type maniptype) |
| 715 | { | 715 | { |
| 716 | int hooknum, nh_off, err = NF_ACCEPT; | 716 | int hooknum, nh_off, err = NF_ACCEPT; |
