lkml.org 
[lkml]   [2013]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH net-next] 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: Stephen Hemminger <stephen@networkplumber.org>
    Acked-by: Randy Dunlap <rdunlap@infradead.org>


    --- a/net/sched/em_ipset.c 2013-10-06 14:48:25.030449222 -0700
    +++ b/net/sched/em_ipset.c 2013-10-16 15:38:05.030278287 -0700
    @@ -24,7 +24,7 @@ static int em_ipset_change(struct tcf_pr
    {
    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_
    {
    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);
    }
    }


    \
     
     \ /
      Last update: 2013-10-17 03:01    [W:4.382 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site