OSDN Git Service

s390/qeth: don't offer .ndo_bridge_* ops for OSA devices
authorJulian Wiedmann <jwi@linux.ibm.com>
Tue, 7 Dec 2021 09:04:50 +0000 (10:04 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 8 Dec 2021 06:01:02 +0000 (22:01 -0800)
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>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/s390/net/qeth_l2_main.c

index 48355fb..d1933c5 100644 (file)
@@ -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)