From: Florian Fainelli <f.fainelli@gmail•com>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, vivien.didelot@savoirfairelinux•com,
andrew@lunn•ch, jiri@resnulli•us,
Florian Fainelli <f.fainelli@gmail•com>
Subject: [PATCH net-next 2/2] Revert "net: dsa: Implement ndo_get_phys_port_id"
Date: Tue, 10 Jan 2017 12:32:37 -0800 [thread overview]
Message-ID: <20170110203237.23907-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170110203237.23907-1-f.fainelli@gmail.com>
This reverts commit 3a543ef479868e36c95935de320608a7e41466ca ("net: dsa:
Implement ndo_get_phys_port_id") since it misuses the purpose of
ndo_get_phys_port_id(). We have ndo_get_phys_port_name() to do the
correct thing for us now.
Signed-off-by: Florian Fainelli <f.fainelli@gmail•com>
---
net/dsa/slave.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index fed3fbd403cb..0cdcaf526987 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -983,15 +983,6 @@ static void dsa_slave_poll_controller(struct net_device *dev)
}
#endif
-static int dsa_slave_get_phys_port_id(struct net_device *dev,
- struct netdev_phys_item_id *ppid)
-{
- struct dsa_slave_priv *p = netdev_priv(dev);
-
- ppid->id_len = sizeof(p->port);
- memcpy(ppid->id, &p->port, ppid->id_len);
-}
-
static int dsa_slave_get_phys_port_name(struct net_device *dev,
char *name, size_t len)
{
@@ -1050,7 +1041,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
.ndo_bridge_getlink = switchdev_port_bridge_getlink,
.ndo_bridge_setlink = switchdev_port_bridge_setlink,
.ndo_bridge_dellink = switchdev_port_bridge_dellink,
- .ndo_get_phys_port_id = dsa_slave_get_phys_port_id,
.ndo_get_phys_port_name = dsa_slave_get_phys_port_name,
};
--
2.9.3
next prev parent reply other threads:[~2017-01-10 20:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 20:32 [PATCH net-next 0/2] net: dsa: Implement ndo_get_phys_port_name() Florian Fainelli
2017-01-10 20:32 ` [PATCH net-next 1/2] " Florian Fainelli
2017-01-10 20:44 ` Vivien Didelot
2017-01-10 20:50 ` Andrew Lunn
2017-01-10 20:58 ` Vivien Didelot
2017-01-10 20:58 ` Florian Fainelli
2017-01-11 7:28 ` Jiri Pirko
2017-01-11 7:29 ` Jiri Pirko
2017-01-10 20:32 ` Florian Fainelli [this message]
2017-01-10 20:44 ` [PATCH net-next 2/2] Revert "net: dsa: Implement ndo_get_phys_port_id" Vivien Didelot
2017-01-11 7:29 ` Jiri Pirko
2017-01-11 14:59 ` [PATCH net-next 0/2] net: dsa: Implement ndo_get_phys_port_name() David Miller
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=20170110203237.23907-3-f.fainelli@gmail.com \
--to=f.fainelli@gmail$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=jiri@resnulli$(echo .)us \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vivien.didelot@savoirfairelinux$(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