From: Ben Greear <greearb@candelatech•com>
To: Jiri Pirko <jiri@resnulli•us>
Cc: netdev@vger•kernel.org, davem@davemloft•net, edumazet@google•com,
bhutchings@solarflare•com, faisal.latif@intel•com,
shemminger@vyatta•com, fbl@redhat•com, roland@kernel•org,
sean.hefty@intel•com, hal.rosenstock@gmail•com, fubar@us•ibm.com,
andy@greyhouse•net, divy@chelsio•com,
jitendra.kalsaria@qlogic•com, sony.chacko@qlogic•com,
linux-driver@qlogic•com, kaber@trash•net,
ursula.braun@de•ibm.com, blaschka@linux•vnet.ibm.com,
schwidefsky@de•ibm.com, heiko.carstens@de•ibm.com,
ebiederm@xmission•com, joe@perches•com, amwang@redhat•com,
nhorman@tuxdriver•com, john.r.fastabend@intel•com,
pablo@netfilter•org
Subject: Re: [patch net-next 04/15] rtnetlink: remove usage of dev->master
Date: Sun, 30 Dec 2012 10:00:55 -0800 [thread overview]
Message-ID: <50E08157.2010001@candelatech.com> (raw)
In-Reply-To: <1356868702-8144-5-git-send-email-jiri@resnulli.us>
On 12/30/2012 03:58 AM, Jiri Pirko wrote:
> Signed-off-by: Jiri Pirko <jiri@resnulli•us>
> ---
> net/core/rtnetlink.c | 69 ++++++++++++++++++++++++++++------------------------
> 1 file changed, 37 insertions(+), 32 deletions(-)
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 2ef7a56..ae612f4 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -880,6 +880,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> const struct rtnl_link_stats64 *stats;
> struct nlattr *attr, *af_spec;
> struct rtnl_af_ops *af_ops;
> + struct net_device *upper_dev = netdev_master_upper_dev_get(dev);
>
> ASSERT_RTNL();
> nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ifm), flags);
> @@ -908,8 +909,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> #endif
> (dev->ifindex != dev->iflink &&
> nla_put_u32(skb, IFLA_LINK, dev->iflink)) ||
> - (dev->master &&
> - nla_put_u32(skb, IFLA_MASTER, dev->master->ifindex)) ||
> + (upper_dev &&
> + nla_put_u32(skb, IFLA_MASTER, upper_dev->ifindex)) ||
This seems confusing to me. You are calling the new variable 'upper_dev',
but it seems you are actually using it as a lower_dev???
Thanks,
Ben
--
Ben Greear <greearb@candelatech•com>
Candela Technologies Inc http://www.candelatech.com
next prev parent reply other threads:[~2012-12-30 18:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-30 11:58 [patch net-next V4 00/15] net: introduce upper device lists and remove dev->master Jiri Pirko
2012-12-30 11:58 ` [patch net-next 01/15] net: introduce upper device lists Jiri Pirko
2012-12-30 18:00 ` Ben Greear
2012-12-30 22:08 ` Jiri Pirko
2012-12-31 4:56 ` Stephen Hemminger
2012-12-31 9:55 ` Jiri Pirko
2012-12-31 19:22 ` Stephen Hemminger
2013-01-01 1:04 ` Jiri Pirko
2012-12-30 11:58 ` [patch net-next 02/15] macvlan: add link to upper device Jiri Pirko
2012-12-30 11:58 ` [patch net-next 03/15] vlan: " Jiri Pirko
2012-12-30 11:58 ` [patch net-next 04/15] rtnetlink: remove usage of dev->master Jiri Pirko
2012-12-30 18:00 ` Ben Greear [this message]
2012-12-30 11:58 ` [patch net-next 05/15] team: remove usage of netdev_set_master() Jiri Pirko
2012-12-30 11:58 ` [patch net-next 06/15] bridge: " Jiri Pirko
2012-12-30 11:58 ` [patch net-next 07/15] netpoll: remove usage of dev->master Jiri Pirko
2012-12-30 11:58 ` [patch net-next 08/15] cxgb3: " Jiri Pirko
2012-12-30 11:58 ` [patch net-next 09/15] qlcnic: guard __vlan_find_dev_deep() by rcu_read_lock Jiri Pirko
2012-12-30 11:58 ` [patch net-next 10/15] qeth: ensure that __vlan_find_dev_deep() is called with rcu_read_lock Jiri Pirko
2012-12-30 11:58 ` [patch net-next 11/15] vlan: remove usage of dev->master in __vlan_find_dev_deep() Jiri Pirko
2012-12-30 11:58 ` [patch net-next 12/15] nes: remove usage of dev->master Jiri Pirko
2012-12-30 11:58 ` [patch net-next 13/15] bonding: " Jiri Pirko
2012-12-30 11:58 ` [patch net-next 14/15] net: remove no longer used netdev_set_bond_master() and netdev_set_master() Jiri Pirko
2012-12-30 11:58 ` [patch net-next 15/15] net: kill dev->master Jiri Pirko
2013-01-02 10:54 ` [patch net-next V4 00/15] net: introduce upper device lists and remove dev->master David Miller
2013-01-02 12:30 ` Jiri Pirko
-- strict thread matches above, loose matches on Subject: below --
2012-12-29 10:38 [patch net-next V3 " Jiri Pirko
2012-12-29 10:38 ` [patch net-next 04/15] rtnetlink: remove usage of dev->master Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50E08157.2010001@candelatech.com \
--to=greearb@candelatech$(echo .)com \
--cc=amwang@redhat$(echo .)com \
--cc=andy@greyhouse$(echo .)net \
--cc=bhutchings@solarflare$(echo .)com \
--cc=blaschka@linux$(echo .)vnet.ibm.com \
--cc=davem@davemloft$(echo .)net \
--cc=divy@chelsio$(echo .)com \
--cc=ebiederm@xmission$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=faisal.latif@intel$(echo .)com \
--cc=fbl@redhat$(echo .)com \
--cc=fubar@us$(echo .)ibm.com \
--cc=hal.rosenstock@gmail$(echo .)com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jiri@resnulli$(echo .)us \
--cc=jitendra.kalsaria@qlogic$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=john.r.fastabend@intel$(echo .)com \
--cc=kaber@trash$(echo .)net \
--cc=linux-driver@qlogic$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
--cc=roland@kernel$(echo .)org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sean.hefty@intel$(echo .)com \
--cc=shemminger@vyatta$(echo .)com \
--cc=sony.chacko@qlogic$(echo .)com \
--cc=ursula.braun@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox