From cdf8df5b42e7d9e2f6e660e672d42edb0514b862 Mon Sep 17 00:00:00 2001 From: Julian Wiedmann Date: Tue, 7 Dec 2021 10:04:50 +0100 Subject: [PATCH] s390/qeth: don't offer .ndo_bridge_* ops for OSA devices 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 Signed-off-by: Alexandra Winter Signed-off-by: Jakub Kicinski --- 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 48355fb..d1933c5 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.7.4