From patchwork Wed Oct 16 22:39:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 284044 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5F8FA2C00BE for ; Thu, 17 Oct 2013 09:40:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761621Ab3JPWjy (ORCPT ); Wed, 16 Oct 2013 18:39:54 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:47210 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756281Ab3JPWjx (ORCPT ); Wed, 16 Oct 2013 18:39:53 -0400 Received: by mail-pd0-f170.google.com with SMTP id x10so1654958pdj.15 for ; Wed, 16 Oct 2013 15:39:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=fdEt/2848sKzQzfkcnpRh6btg5Px5MuDjJ8aAt5s9qE=; b=g/vwuw2ntTf8H3ptlQsP989xGbMeJhApOm87nqytROe4Hu6vMh2DFnhp8aukDR3o1M zntv1MJaMxGws9LALBB7eGf6RgNvqCBnzMGgA4W+eqWP2r6+aT6fL0glBV6n2j3ifxbA G2tC3+XFavRtlmwlyzCbAAma4btzrYQ32hKKmjs7Z6wWYf0jUk79rnnzYHSp5FbmpAgi KpyBLvK6plt2ZR3ud7ioRD5mFI/2H0LHStGVEmeYGZC2hSNR0TxuLiNBQG1wsjcq+bPB wQNUqUKJ8Ex436pxEwoux67KrA9oAFnazkHhe24Hf6XXJfcAnid3VclVXNbvNz6ZVqpi gQBg== X-Gm-Message-State: ALoCoQnbw5UJLO9tkvB+sAt60xgJojkAG1fHKS9OaDlYoYlNhUmdyYzCDBWMn2pEsAAH+dk+vcgU X-Received: by 10.66.217.166 with SMTP id oz6mr5946387pac.22.1381963192229; Wed, 16 Oct 2013 15:39:52 -0700 (PDT) Received: from nehalam.linuxnetplumber.net (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51]) by mx.google.com with ESMTPSA id yg3sm109394584pab.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 16 Oct 2013 15:39:51 -0700 (PDT) Date: Wed, 16 Oct 2013 15:39:49 -0700 From: Stephen Hemminger To: Randy Dunlap , Vitaly Lavrov Cc: Thierry Reding , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown , "netdev@vger.kernel.org" Subject: Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c) Message-ID: <20131016153949.5f2257b4@nehalam.linuxnetplumber.net> In-Reply-To: <525F09B0.4080802@infradead.org> References: <1381949500-501-1-git-send-email-treding@nvidia.com> <525F09B0.4080802@infradead.org> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, 16 Oct 2013 14:48:32 -0700 Randy Dunlap wrote: > On 10/16/13 11:51, Thierry Reding wrote: > > Hi all, > > > > I've uploaded today's linux-next tree to the master branch of the > > repository below: > > > > git://gitorious.org/thierryreding/linux-next.git > > > > A next-20131016 tag is also provided for convenience. > > > > Gained two new conflicts, but nothing too exciting. x86 and ARM default > > configurations as well as the x86 allmodconfig mostly build fine on the > > final tree. There was a failure for the ARM at91x40_defconfig, but the > > proper fix wasn't immediately obvious to me, so I've left it broken for > > now. > > on i386, when CONFIG_NET_NS is not enabled: > > net/sched/em_ipset.c: In function 'em_ipset_change': > net/sched/em_ipset.c:27:36: error: 'struct net_device' has no member named 'nd_net' > net/sched/em_ipset.c: In function 'em_ipset_destroy': > net/sched/em_ipset.c:49:34: error: 'struct net_device' has no member named 'nd_net' > > I think this should fix. Acked-by: Randy Dunlap --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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); } }