[PATCH net-next 2/5] net: sched: em_ipt: set the family based on the protocol when matching

[Nikolay Aleksandrov]

Set the family based on the protocol otherwise protocol-neutral matches
will have wrong information (e.g. NFPROTO_UNSPEC). In preparation for
using NFPROTO_UNSPEC xt matches.

Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com>
---
 net/sched/em_ipt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/sched/em_ipt.c b/net/sched/em_ipt.c
index 64dbafe4e94c..23965a071177 100644
--- a/net/sched/em_ipt.c
+++ b/net/sched/em_ipt.c
@@ -189,10 +189,12 @@ static int em_ipt_match(struct sk_buff *skb, struct 
tcf_ematch *em,
        case htons(ETH_P_IP):
                if (!pskb_network_may_pull(skb, sizeof(struct iphdr)))
                        return 0;
+               state.pf = NFPROTO_IPV4;
                break;
        case htons(ETH_P_IPV6):
                if (!pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
                        return 0;
+               state.pf = NFPROTO_IPV6;
                break;
        default:
                return 0;
@@ -203,7 +205,7 @@ static int em_ipt_match(struct sk_buff *skb, struct 
tcf_ematch *em,
        if (skb->skb_iif)
                indev = dev_get_by_index_rcu(em->net, skb->skb_iif);
 
-       nf_hook_state_init(&state, im->hook, im->match->family,
+       nf_hook_state_init(&state, im->hook, state.pf,
                           indev ?: skb->dev, skb->dev, NULL, em->net, NULL);
 
        acpar.match = im->match;
-- 
2.20.1