netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandra Winter <wintera@linux.ibm.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
	Heiko Carstens <hca@linux.ibm.com>,
	Julian Wiedmann <jwi@linux.ibm.com>,
	Alexandra Winter <wintera@linux.ibm.com>
Subject: [PATCH net-next 3/5] s390/qeth: don't offer .ndo_bridge_* ops for OSA devices
Date: Tue,  7 Dec 2021 10:04:50 +0100	[thread overview]
Message-ID: <20211207090452.1155688-4-wintera@linux.ibm.com> (raw)
In-Reply-To: <20211207090452.1155688-1-wintera@linux.ibm.com>

From: Julian Wiedmann <jwi@linux.ibm.com>

qeth_l2_detect_dev2br_support() will only set brport_hw_features for IQD
devices. So qeth_l2_bridge_getlink() and qeth_l2_bridge_setlink() will
always return -EOPNOTSUPP on OSA devices. Just don't offer these
callbacks instead.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
---
 drivers/s390/net/qeth_l2_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 48355fbc0712..d1933c54bfbb 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1091,8 +1091,6 @@ static const struct net_device_ops qeth_l2_osa_netdev_ops = {
 	.ndo_tx_timeout		= qeth_tx_timeout,
 	.ndo_fix_features	= qeth_fix_features,
 	.ndo_set_features	= qeth_set_features,
-	.ndo_bridge_getlink	= qeth_l2_bridge_getlink,
-	.ndo_bridge_setlink	= qeth_l2_bridge_setlink,
 };
 
 static int qeth_l2_setup_netdev(struct qeth_card *card)
-- 
2.32.0


  parent reply	other threads:[~2021-12-07  9:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-07  9:04 [PATCH net-next 0/5] s390/net: updates 2021-12-06 Alexandra Winter
2021-12-07  9:04 ` [PATCH net-next 1/5] s390/qeth: simplify qeth_receive_skb() Alexandra Winter
2021-12-07  9:04 ` [PATCH net-next 2/5] s390/qeth: split up L2 netdev_ops Alexandra Winter
2021-12-07  9:04 ` Alexandra Winter [this message]
2021-12-07  9:04 ` [PATCH net-next 4/5] s390/qeth: fine-tune .ndo_select_queue() Alexandra Winter
2021-12-07  9:04 ` [PATCH net-next 5/5] s390/qeth: remove check for packing mode in qeth_check_outbound_queue() Alexandra Winter
2021-12-08  6:10 ` [PATCH net-next 0/5] s390/net: updates 2021-12-06 patchwork-bot+netdevbpf

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=20211207090452.1155688-4-wintera@linux.ibm.com \
    --to=wintera@linux.ibm.com \
    --cc=davem@davemloft.net \
    --cc=hca@linux.ibm.com \
    --cc=jwi@linux.ibm.com \
    --cc=kuba@kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).