On Wed, Dec 2, 2015 at 9:54 AM, Jiri Pirko <j...@resnulli.us> wrote:
> Wed, Dec 02, 2015 at 06:28:35AM CET, gerlitz...@gmail.com wrote:
>>On Tue, Dec 1, 2015 at 3:48 PM, Jiri Pirko <j...@resnulli.us> wrote:
>>> From: Jiri Pirko <j...@mellanox.com>
>>>
>>> Sometimes the drivers and other code would find it handy to know some
>>> internal information about upper device being changed. So allow upper-code
>>> to pass information down to notifier listeners during linking.
>>[...]
>>> diff --git a/drivers/net/bonding/bond_main.c
>>> b/drivers/net/bonding/bond_main.c
>>> index 9240157..fa3ed1d 100644
>>> --- a/drivers/net/bonding/bond_main.c
>>> +++ b/drivers/net/bonding/bond_main.c
>>> @@ -1204,7 +1204,7 @@ static int bond_master_upper_dev_link(struct
>>> net_device *bond_dev,
>>> {
>>> int err;
>>>
>>> - err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave);
>>> + err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave,
>>> NULL);
>>> if (err)
>>> return err;
>>> slave_dev->flags |= IFF_SLAVE;
>>> diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
>>> index b37f8d1..f7b6ff7 100644
>>> --- a/drivers/net/team/team.c
>>> +++ b/drivers/net/team/team.c
>>> @@ -1083,7 +1083,7 @@ static int team_upper_dev_link(struct net_device *dev,
>>> {
>>> int err;
>>>
>>> - err = netdev_master_upper_dev_link(port_dev, dev, NULL);
>>> + err = netdev_master_upper_dev_link(port_dev, dev, NULL, NULL);
>>> if (err)
>>> return err;
>>> port_dev->priv_flags |= IFF_TEAM_PORT;
>>> diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
>>> index 59c5bdd..8944a49 100644
>>> --- a/drivers/net/vrf.c
>>> +++ b/drivers/net/vrf.c
>>> @@ -624,7 +624,7 @@ static int do_vrf_add_slave(struct net_device *dev,
>>> struct net_device *port_dev)
>>> goto out_fail;
>>> }
>>>
>>> - ret = netdev_master_upper_dev_link(port_dev, dev, NULL);
>>> + ret = netdev_master_upper_dev_link(port_dev, dev, NULL, NULL);
>>> if (ret < 0)
>>> goto out_unregister;
>>>
>>> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
>>> index cca4111..a55be5b 100644
>>> --- a/include/linux/netdevice.h
>>> +++ b/include/linux/netdevice.h
>>> @@ -2161,6 +2161,7 @@ struct netdev_notifier_changeupper_info {
>>> struct net_device *upper_dev; /* new upper dev */
>>> bool master; /* is upper dev master */
>>> bool linking; /* is the nofication for link or unlink */
>>> + void *upper_info; /* is upper dev info */
>>
>>not sure to follow what did you mean by "is upper dev info"...
>>
>>maybe remove the "is" and just make it "upper dev info"?
>
> I just followed previous lines.
yes, c&p bugs happen... (BTW they can be much more nasty vs. what
we have here), the previous lines describe booleans which tell "does ZZZ
hold" where the field you added isn't boolean and provided pointer to info
Or.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
