Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / net / sched / em_ipset.c

diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c
index 1ac41d3de5c36d4c32cf27806172b6ea884980de..527aeb7a3ff0b3b558873d0c7d93fc2c26e100b8 100644 (file)
--- a/net/sched/em_ipset.c
+++ b/net/sched/em_ipset.c
@@ -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);
        }
 }