From: roopa <roopa@cumulusnetworks•com>
To: sfeldma@gmail•com
Cc: netdev@vger•kernel.org, jiri@resnulli•us, linux@roeck-us•net,
f.fainelli@gmail•com
Subject: Re: [PATCH net-next 12/18] switchdev: remove unused netdev_switch_port_bridge_dellink
Date: Mon, 30 Mar 2015 06:23:05 -0700 [thread overview]
Message-ID: <55194E39.4000108@cumulusnetworks.com> (raw)
In-Reply-To: <1427704836-8776-13-git-send-email-sfeldma@gmail.com>
On 3/30/15, 1:40 AM, sfeldma@gmail•com wrote:
> From: Scott Feldman <sfeldma@gmail•com>
>
> There are no port driver using bridge_dellink, so remove these swdev wrappers.
> Something was fishy here anyway because dellink isn't used for deleting port
> attributes (not sure how you delete a port attribute?). VLAN deletes are
> already handled via ndo_vlan_rx_add_vid/ndo_vlan_rx_kill_vid.
>
> Signed-off-by: Scott Feldman <sfeldma@gmail•com>
dellink is used for vlan deletes in the new bridge vlan filtering bridge.
> ---
> drivers/net/bonding/bond_main.c | 1 -
> drivers/net/team/team.c | 1 -
> include/net/switchdev.h | 18 -------------
> net/bridge/br_netlink.c | 12 +--------
> net/switchdev/switchdev.c | 55 ---------------------------------------
> 5 files changed, 1 insertion(+), 86 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 99ab282..9d823b6 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -4037,7 +4037,6 @@ static const struct net_device_ops bond_netdev_ops = {
> .ndo_del_slave = bond_release,
> .ndo_fix_features = bond_fix_features,
> .ndo_bridge_setlink = swdev_port_bridge_setlink,
> - .ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink,
> .ndo_features_check = passthru_features_check,
> };
>
> diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
> index 6a3debc..101b341 100644
> --- a/drivers/net/team/team.c
> +++ b/drivers/net/team/team.c
> @@ -1978,7 +1978,6 @@ static const struct net_device_ops team_netdev_ops = {
> .ndo_fix_features = team_fix_features,
> .ndo_change_carrier = team_change_carrier,
> .ndo_bridge_setlink = swdev_port_bridge_setlink,
> - .ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink,
> .ndo_features_check = passthru_features_check,
> };
>
> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
> index bad2ec7..97196ab 100644
> --- a/include/net/switchdev.h
> +++ b/include/net/switchdev.h
> @@ -92,10 +92,6 @@ int register_netdev_switch_notifier(struct notifier_block *nb);
> int unregister_netdev_switch_notifier(struct notifier_block *nb);
> int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
> struct netdev_switch_notifier_info *info);
> -int netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags);
> -int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags);
> int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
> u8 tos, u8 type, u32 nlflags, u32 tb_id);
> int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
> @@ -138,20 +134,6 @@ static inline int call_netdev_switch_notifiers(unsigned long val, struct net_dev
> return NOTIFY_DONE;
> }
>
> -static inline int netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh,
> - u16 flags)
> -{
> - return -EOPNOTSUPP;
> -}
> -
> -static inline int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh,
> - u16 flags)
> -{
> - return 0;
> -}
> -
> static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
> struct fib_info *fi,
> u8 tos, u8 type,
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 5deb063..cfee027 100644
> --- a/net/bridge/br_netlink.c
> +++ b/net/bridge/br_netlink.c
> @@ -639,7 +639,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
> {
> struct nlattr *afspec;
> struct net_bridge_port *p;
> - int err = 0, ret_offload = 0;
> + int err = 0;
>
> afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
> if (!afspec)
> @@ -658,16 +658,6 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
> */
> br_ifinfo_notify(RTM_NEWLINK, p);
>
> - if (p && !(flags & BRIDGE_FLAGS_SELF)) {
> - /* del bridge attributes in hardware
> - */
> - ret_offload = netdev_switch_port_bridge_dellink(dev, nlh,
> - flags);
> - if (ret_offload && ret_offload != -EOPNOTSUPP)
> - br_warn(p->br, "error deleting attrs on port %u (%s)\n",
> - (unsigned int)p->port_no, p->dev->name);
> - }
> -
> return err;
> }
> static int br_validate(struct nlattr *tb[], struct nlattr *data[])
> diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
> index 0307a45..8a07096 100644
> --- a/net/switchdev/switchdev.c
> +++ b/net/switchdev/switchdev.c
> @@ -258,61 +258,6 @@ int swdev_port_bridge_setlink(struct net_device *dev,
> }
> EXPORT_SYMBOL_GPL(swdev_port_bridge_setlink);
>
> -/**
> - * netdev_switch_port_bridge_dellink - Notify switch device port of bridge
> - * port attribute delete
> - *
> - * @dev: port device
> - * @nlh: netlink msg with bridge port attributes
> - * @flags: bridge setlink flags
> - *
> - * Notify switch device port of bridge port attribute delete
> - */
> -int netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags)
> -{
> - const struct net_device_ops *ops = dev->netdev_ops;
> -
> - if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
> - return 0;
> -
> - if (!ops->ndo_bridge_dellink)
> - return -EOPNOTSUPP;
> -
> - return ops->ndo_bridge_dellink(dev, nlh, flags);
> -}
> -EXPORT_SYMBOL_GPL(netdev_switch_port_bridge_dellink);
> -
> -/**
> - * ndo_dflt_netdev_switch_port_bridge_dellink - default ndo bridge dellink
> - * op for master devices
> - *
> - * @dev: port device
> - * @nlh: netlink msg with bridge port attributes
> - * @flags: bridge dellink flags
> - *
> - * Notify master device slaves of bridge port attribute deletes
> - */
> -int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags)
> -{
> - struct net_device *lower_dev;
> - struct list_head *iter;
> - int ret = 0, err = 0;
> -
> - if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
> - return ret;
> -
> - netdev_for_each_lower_dev(dev, lower_dev, iter) {
> - err = netdev_switch_port_bridge_dellink(lower_dev, nlh, flags);
> - if (err && err != -EOPNOTSUPP)
> - ret = err;
> - }
> -
> - return ret;
> -}
> -EXPORT_SYMBOL_GPL(ndo_dflt_netdev_switch_port_bridge_dellink);
> -
> static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
> {
> const struct swdev_ops *ops = dev->swdev_ops;
next prev parent reply other threads:[~2015-03-30 13:23 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 8:40 [PATCH net-next 00/18] switchdev: spring cleanup sfeldma
2015-03-30 8:40 ` [PATCH net-next 01/18] switchdev: introduce get/set attrs ops sfeldma
2015-03-30 8:40 ` [PATCH net-next 02/18] switchdev: flesh out get/set attr ops sfeldma
2015-03-30 11:55 ` Jiri Pirko
2015-03-30 18:32 ` Arad, Ronen
2015-03-30 20:46 ` Jiri Pirko
2015-03-30 21:00 ` Scott Feldman
2015-03-31 0:22 ` Arad, Ronen
2015-03-31 0:38 ` Scott Feldman
2015-03-31 15:37 ` roopa
[not found] ` <CAJieiUh0Svt3LZsgoi7RaV8Be0eFyRvoJU3BmW7v3fEvwfXiHg@mail.gmail.com>
2015-03-31 16:05 ` Scott Feldman
2015-03-30 8:40 ` [PATCH net-next 03/18] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-03-30 8:40 ` [PATCH net-next 04/18] switchdev: convert STP update to swdev attr set sfeldma
2015-03-30 11:54 ` Jiri Pirko
2015-03-30 13:47 ` roopa
2015-03-30 8:40 ` [PATCH net-next 05/18] switchdev: add bridge port flags attr sfeldma
2015-03-30 8:40 ` [PATCH net-next 06/18] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-03-30 12:01 ` Jiri Pirko
2015-03-30 8:40 ` [PATCH net-next 07/18] switchdev: add new swdev bridge setlink sfeldma
2015-03-30 12:31 ` Jiri Pirko
2015-03-30 8:40 ` [PATCH net-next 08/18] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-03-30 8:40 ` [PATCH net-next 09/18] bonding: " sfeldma
2015-03-30 8:40 ` [PATCH net-next 10/18] team: " sfeldma
2015-03-30 8:40 ` [PATCH net-next 11/18] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-03-30 13:23 ` roopa
2015-03-30 20:20 ` Scott Feldman
2015-03-30 20:46 ` Arad, Ronen
2015-03-30 21:27 ` Scott Feldman
2015-03-31 0:08 ` Arad, Ronen
2015-03-31 0:44 ` Scott Feldman
2015-03-31 5:52 ` Jiri Pirko
2015-03-31 19:15 ` Arad, Ronen
2015-03-31 21:52 ` Jiri Pirko
2015-03-31 23:32 ` Arad, Ronen
2015-04-01 2:38 ` Scott Feldman
2015-04-01 12:03 ` Jamal Hadi Salim
2015-04-01 17:56 ` Scott Feldman
2015-04-02 1:01 ` Florian Fainelli
2015-03-30 8:40 ` [PATCH net-next 12/18] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-03-30 13:23 ` roopa [this message]
2015-03-30 8:40 ` [PATCH net-next 13/18] switchdev: remove unused NETIF_F_HW_SWITCH_OFFLOAD sfeldma
2015-03-30 13:38 ` roopa
2015-03-30 20:48 ` Samudrala, Sridhar
2015-03-30 21:20 ` Scott Feldman
2015-03-31 15:34 ` roopa
[not found] ` <CAJieiUiL4QRQAC30=bkYadYD2L2cOcn7mNLV98uH3Go0exMO+A@mail.gmail.com>
2015-03-31 16:03 ` Scott Feldman
2015-03-30 8:40 ` [PATCH net-next 14/18] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-03-30 8:40 ` [PATCH net-next 15/18] rocker: cut over to " sfeldma
2015-03-30 8:40 ` [PATCH net-next 16/18] switchdev: rename netdev_switch_fib_* to swdev_fib_* sfeldma
2015-03-30 8:40 ` [PATCH net-next 17/18] switchdev: rename netdev_switch_notifier_* to swdev_notifier_* sfeldma
2015-03-30 8:40 ` [PATCH net-next 18/18] switchdev: bring documentation up-to-date sfeldma
2015-03-30 12:00 ` [PATCH net-next 00/18] switchdev: spring cleanup Jiri Pirko
2015-03-30 13:11 ` Andy Gospodarek
2015-03-30 15:00 ` roopa
2015-03-30 16:11 ` Or Gerlitz
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=55194E39.4000108@cumulusnetworks.com \
--to=roopa@cumulusnetworks$(echo .)com \
--cc=f.fainelli@gmail$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=linux@roeck-us$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfeldma@gmail$(echo .)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