* Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)
[not found] <1381949500-501-1-git-send-email-treding@nvidia.com>
@ 2013-10-16 21:48 ` Randy Dunlap
2013-10-16 22:39 ` Stephen Hemminger
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2013-10-16 21:48 UTC (permalink / raw)
To: Thierry Reding
Cc: linux-next, linux-kernel, Mark Brown, netdev@vger.kernel.org
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'
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)
2013-10-16 21:48 ` linux-next: Tree for Oct 16 (net/sched/em_ipset.c) Randy Dunlap
@ 2013-10-16 22:39 ` Stephen Hemminger
2013-10-17 0:21 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Hemminger @ 2013-10-16 22:39 UTC (permalink / raw)
To: Randy Dunlap, Vitaly Lavrov
Cc: Thierry Reding, linux-next, linux-kernel, Mark Brown,
netdev@vger.kernel.org
On Wed, 16 Oct 2013 14:48:32 -0700
Randy Dunlap <rdunlap@infradead.org> 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.
--- 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);
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)
2013-10-16 22:39 ` Stephen Hemminger
@ 2013-10-17 0:21 ` Randy Dunlap
2013-10-17 0:29 ` [PATCH net-next] em_ipset: use dev_net() accessor Stephen Hemminger
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2013-10-17 0:21 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Vitaly Lavrov, Thierry Reding, linux-next, linux-kernel,
Mark Brown, netdev@vger.kernel.org
On 10/16/13 15:39, Stephen Hemminger wrote:
> On Wed, 16 Oct 2013 14:48:32 -0700
> Randy Dunlap <rdunlap@infradead.org> 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.
>
That works. Thanks.
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);
> }
> }
> --
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next] em_ipset: use dev_net() accessor
2013-10-17 0:21 ` Randy Dunlap
@ 2013-10-17 0:29 ` Stephen Hemminger
2013-10-18 20:23 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Hemminger @ 2013-10-17 0:29 UTC (permalink / raw)
To: Randy Dunlap, David Miller
Cc: Vitaly Lavrov, Thierry Reding, linux-next, linux-kernel,
Mark Brown, netdev@vger.kernel.org, Jamal Hadi Salim
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);
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] em_ipset: use dev_net() accessor
2013-10-17 0:29 ` [PATCH net-next] em_ipset: use dev_net() accessor Stephen Hemminger
@ 2013-10-18 20:23 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-10-18 20:23 UTC (permalink / raw)
To: stephen
Cc: rdunlap, lve, thierry.reding, linux-next, linux-kernel, broonie,
netdev, jhs
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 16 Oct 2013 17:29:34 -0700
> 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>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-18 20:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1381949500-501-1-git-send-email-treding@nvidia.com>
2013-10-16 21:48 ` linux-next: Tree for Oct 16 (net/sched/em_ipset.c) Randy Dunlap
2013-10-16 22:39 ` Stephen Hemminger
2013-10-17 0:21 ` Randy Dunlap
2013-10-17 0:29 ` [PATCH net-next] em_ipset: use dev_net() accessor Stephen Hemminger
2013-10-18 20:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).