Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1eda2ac authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

em_ipset: use dev_net() accessor 



Randy found that if network namespace not enabled then
nd_net does not exist and would cause compilation failure.

This is handled correctly by using the dev_net() macro.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 675297c9

net/sched/em_ipset.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int em_ipset_change(struct tcf_proto *tp, void *data, int data_len, 
{

	struct xt_set_info *set = data;

	ip_set_id_t index;

	struct net *net = qdisc_dev(tp->q)->nd_net;

	struct net *net = dev_net(qdisc_dev(tp->q));



	if (data_len != sizeof(*set))

		return -EINVAL;
@@ -46,7 +46,7 @@ static void em_ipset_destroy(struct tcf_proto *p, struct tcf_ematch *em) 
{

	const struct xt_set_info *set = (const void *) em->data;

	if (set) {

		ip_set_nfnl_put(qdisc_dev(p->q)->nd_net, set->index);

		ip_set_nfnl_put(dev_net(qdisc_dev(p->q)), set->index);

		kfree((void *) em->data);

	}

}