diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index a36e6553ddb3..77d209c235a0 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -1851,7 +1851,9 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, | |||
| 1851 | if (err < 0) | 1851 | if (err < 0) |
| 1852 | return err; | 1852 | return err; |
| 1853 | 1853 | ||
| 1854 | if (cda[CTA_EXPECT_MASTER]) | 1854 | if (cda[CTA_EXPECT_TUPLE]) |
| 1855 | err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_TUPLE, u3); | ||
| 1856 | else if (cda[CTA_EXPECT_MASTER]) | ||
| 1855 | err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_MASTER, u3); | 1857 | err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_MASTER, u3); |
| 1856 | else | 1858 | else |
| 1857 | return -EINVAL; | 1859 | return -EINVAL; |
