Message ID | 1488110258-54766-1-git-send-email-talatb@mellanox.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYDpZ1Yhnz9sNv; Wed, 1 Mar 2017 23:12:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="BWXfT/OY"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1cj37C-0005ax-3b; Wed, 01 Mar 2017 12:12:18 +0000 Received: from mail-eopbgr50061.outbound.protection.outlook.com ([40.107.5.61] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from <talatb@mellanox.com>) id 1chxSa-0000q4-A0 for kernel-team@lists.canonical.com; Sun, 26 Feb 2017 11:57:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BzA8vezu2nBwPXqWoiplv1VBqS+7s/fF6Jbs5coZg7I=; b=BWXfT/OYIKBsDKr+M6MOdJTO6U9cCWJZ3aeoLTutoB8Z4bZxcQLE/QVIZmxlYzSlXLnIIMUHkWez4+a9BFdQkdGhBRAv4WEv6e5G7G0wIhxWgBcUOpeuIK5bqTgipFXQpArsGQ0HZUIK3wl01v2jNZvYcDkTGH6zCSf14CP8XPw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=talatb@mellanox.com; Received: from dev-h-vrt-005.mth.labs.mlnx (193.47.165.251) by DB5PR05MB1303.eurprd05.prod.outlook.com (2a01:111:e400:51cc::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Sun, 26 Feb 2017 11:57:50 +0000 From: Talat Batheesh <talatb@mellanox.com> To: <kernel-team@lists.canonical.com> Subject: [PATCH] [Xenial] net/bonding: Enforce active-backup policy for IPoIB bonds Date: Sun, 26 Feb 2017 13:57:38 +0200 Message-ID: <1488110258-54766-1-git-send-email-talatb@mellanox.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: VI1PR07CA0056.eurprd07.prod.outlook.com (2a01:111:e400:5967::24) To DB5PR05MB1303.eurprd05.prod.outlook.com (2a01:111:e400:51cc::24) X-MS-Office365-Filtering-Correlation-Id: 083f1c05-9de9-4793-dc31-08d45e3eb079 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:DB5PR05MB1303; X-Microsoft-Exchange-Diagnostics: 1; DB5PR05MB1303; 3:bwvq3C3udb3LyY4L9MFWdk6EkGdGp9eCaY1mtmMBRnM3l3T6m9N2M+msl301XewRc5RRfIK1e3DOyy+hGs+BObcg9wgqPzLxlQ9HslTymBdDDUYN/2VO7wDKEsjHeuyyJDSfUuN77LpicSCM2KVqGFASpxx6F/TBB+/p6UAXMLNFOQXpFgnLrDJ22XT39sWOoy07y8BtYpE3Ha+vssXT+K5XwCNWTjk8CFeOYpHtzmGQPriTOFxkXKB0LC13WReOnzV5JApgzZn4yDEBf8o7L6vInUbu1SoYdHNFSv/akLs=; 25:Cx6Ss4YvfDR6m3JQhfTgmEhAyAtYnHHzytwBFJRzFTa5ticLqKdbFANM1nUezOpjIzDH/MILkolD6PWKc0WLJ67mNyizLFcJi1HkaW928SkA/gJljzXf9eXhnGu18aAmEXpXWY4RTIWvkRYZxHKFxITX7XWVixNBHlxPcu2J3CSUOF5nuXMjdBqOOJsc0TCCd38mnuvw1Adn/wuhaBVV2HwRLRvty1cv2LRV5BCqnW1DWkxB7QDtJXaUoHMoyp3gxxFk82Er+QhHxSZLoPD5gMFRHfNNiRwehC17GMviE6bkGLHsHgu+AK9zntmH+8dRg3IecB9BwI41Zr96yCkw9VYNEYnzxsEES4mnULVCYAC9gsRjB3NC3XwzZZm0tewFLoeZtQ4v/k21st7B9c2dzPRJ0iy65evhCHOiOkwKK8g6UF2lgCh5aE71F6HMlXPSWtl28mb8D4UlZ4ZK+2iJHw== X-Microsoft-Exchange-Diagnostics: 1; DB5PR05MB1303; 31:DyMR39p4Wclsj7b3rM7RwDr/1H+X/sS0IA8Aruxc98x9lgGxV0i+JkTOl4YkULts6P4ai0ITXMY84RIu1x++FAT3WS3gRO+vxG4D75Km8aRqKn0Slr/pYmy4ihn+OM+0yi8uS192al70iDGfioawXSWdcyuvqk/Nqchx8ktxMO6Xfk9XO5cEs9E0cNXFIoBsoCQIpG7dSMrlV2Ub6tJypSOqoIuEtVTTWZPDs9zQoyY=; 20:t412hFGWgcDUZherxC0zRk/x9/1gAdDG3yALQT26htk/kanQ+hzf5sNsYuXuSqpDU3KyV4VE4n1RqfxNZgGac6Fp4WpwPIoUn6eHuABHyidvkRbSlx+0xPyLgT14aUt1au/7dAPAi/dBUxUFXnrkCMY9FpXH4CyfTJHuIox1UFE7d5tviTy3pssLNNGAmJzIBnjLPRZuSy6qsoK9kWRWUxQQNoHTari0Z6qHm5I2oqwtoaMnHNRLy/2P2i1NzzKffGyNcOHX4ilQ0UPTgcX+Yym1mtCbxNJcuExyHbQsfStY0QhIa6nqmst832XlWcK4o+mob7Lxx7uAw1DPP5av2lnTgRYqrH6zBcNjzbf6miTz7M0N92Fz19EH0YGqGc+0Z7QCXr3N3dY2/D+tj5dD1fw3bnrR/BSQLavrMoDron4uTwChbcKAGmE+LC03ho4jzaCVni0LBLwiUwPlmT/F/P1XzZZdtLszxFP6RuweLwZVMz1Lui+JJZaN7kE2dwu5 X-Microsoft-Antispam-PRVS: <DB5PR05MB13039BE0A50787B1C2570A6BAB540@DB5PR05MB1303.eurprd05.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(211254476889703)(24339691489775)(198206253151910); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123562025)(20161123558025)(20161123560025)(20161123564025)(6072148); SRVR:DB5PR05MB1303; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1303; X-Microsoft-Exchange-Diagnostics: 1; DB5PR05MB1303; 4:vr4t1dVbiDbfK4NhltE1t9XkDvzIFXIfOj6tPuGyrQJdT3fl/U7OLaDiEr80ZB2phqo7vRCIzo5lhvp6KcFF24Sn/BzCcIO7ymV5kSWy3e+sN1k/2yR3X6kI3oGytiTegWRw+tXkH5uW1SSCE5df2Z2htqdOTrP/a2U0I9oiMskCjqP6TqwjmR9pMflXqqgQdgoTgQuT2BM3Njy/WvEEaUTWqr6jebJ31E1WXhSNPf0ZvESv9Er05K17fOaPqXvXpfEkLQ63nTU+iKf2AAvREr7dMNDbuf87lLPC5WjEmA3Ae1NwJsq599QLVw4poYHBONECddtnwAL1nIDty9Ako4mRWqyHFdYBPoYoQsZzHvYXpTZWb51yaCT0LrBFCucSeVNc+LCNH0cTzNgrTrOzTn9YYr+noAY1f+m6wmFMhZHvs80o65VHLyjj20tT/AUFdcOhHf32/PQFvJ+Tlx+fx93rSIqkCPoF9Ca2L1uUtfrNV3e/ihIclOo80bn86tVNek3X2HfNpeKYGPchQfLe+sPul0rfFFv/A92F8xH0NrPG+CzH1XjkPvZZMgEd7PHvOtoi9BqaOf3ahcX7VDcREj+ckuUcmxk487cBOGFbP9mOM7JSTxp7nwxRRrzDPYLwT3Nh5e6y0POJ7w6sNkz3b0G6PPV4vmHkoaVO8JyL5ZAkiKJ7JQjmbcyfSRQAWOIvKIZ0AaJ7m32pk0dhJqMX456hHE6LrCkLxiLJ4Uj/UVA= X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39850400002)(39840400002)(39450400003)(39410400002)(189002)(199003)(106356001)(101416001)(6486002)(47776003)(450100001)(50986999)(2351001)(97736004)(5660300001)(68736007)(105586002)(189998001)(6116002)(3846002)(36756003)(66066001)(6506006)(33646002)(92566002)(86362001)(42186005)(575784001)(5003940100001)(6306002)(50466002)(54906002)(50226002)(53936002)(48376002)(6916009)(6666003)(7736002)(305945005)(6512007)(4326007)(2906002)(8676002)(81166006)(81156014)(38730400002)(110136004)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1303; H:dev-h-vrt-005.mth.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR05MB1303; 23:W/ZQSzWcZQ1M+rg+58rbj7ezqixliFyOH/xBRYFqp?= =?us-ascii?Q?zuEHks3YvJlYrdnOjSmYv0iSTsQZSl8EixmeAGA2EGJ0XDENlFECln7NCYxz?= =?us-ascii?Q?n1QK1FMZyO0pDKlULkJkewY15GrJupMvy/8zGQu5HSxytt/yc7M7yPG5PhH1?= =?us-ascii?Q?tuk0dPo2s+Vh/KBJWq/1Q3JtslrriyT5b6EGPgpkcFs8NBWW8bhMQO3VMiLN?= =?us-ascii?Q?eNV91mt01qFHYvyDPxfk4ttPwz6eGIY9sWaJgBxYcD54KfZhElZAO4/voUcJ?= =?us-ascii?Q?6FwCdracRtRprBBsc7O9OwW5i9c17t0Z9BS1y3OplmadcuiGFCLXd1tMnTH/?= =?us-ascii?Q?A3wfa/5FZ2uvni088tXQyRv+c0wdchsXWzuB4uD4e9C7Hq4bkHLcj2Dyuh1G?= =?us-ascii?Q?6QE6fzoidYyfPqFb7Pg1kjQk3eNEw73U5QVE8y20HzcLvKOxfqE6nlTgkZXR?= =?us-ascii?Q?vmuSYB5MHjc/vSbzHaxP8OPpPBrLVE7fINrXZtdS0VgH2ymvbEN9Ct42mHDQ?= =?us-ascii?Q?Pjq7hROP6SH9wk5VxA0c/nbykKZhequtaJj8ZrzBlgMSEUa61PImqqN2LPET?= =?us-ascii?Q?1EmzpCn2O3q+hP6JiKhE9sn6+RhfJ3F0DHqAEEFH7ttMz5GZJXg1wimOtUKj?= =?us-ascii?Q?GYITw11zBHrSCENw6TPRcDNzfmRH3p76pN/VcI6JEcAHg58Vx12NQtkEY0Wi?= =?us-ascii?Q?VZ2DKNbyOZyF6GTfWqvFcxZ2B0GBQihbnA5/d9P3oOB++Sogo5UhCxuOk6ka?= =?us-ascii?Q?5BliAuIpmTe0f3XHBihgac1VFTQN9MKKJqiPLgVhx/vPpizUbUIsQbUNOTx+?= =?us-ascii?Q?kyoCQxsmxx35j2/VD7FLq/vDiMtjNIolzv0+K3f27JTzSQqGzpLK6zlWvHUg?= =?us-ascii?Q?ddnDY4dMK9sebR4KGUa2+zSYomAGzaWTSX+QB9ROg+LCD+fEuttjIBsBPy/A?= =?us-ascii?Q?r3NT8+nlMIWwX+rDLVvINDnqdlS3a5SpwBYpgbVgeTRzUksPzFlDM4yAAIb4?= =?us-ascii?Q?0l1CvwuIFCoIgehPgHwR7OkRD0Ia6FU1oJWWKyaqAgFmsrps5W9IWFpOrEbv?= =?us-ascii?Q?/VfcN7snfPHpw0p2N74bMzfS7DwcHI+OUW+7jVxvdAkymxi96m6NEa9Hj1v8?= =?us-ascii?Q?iwCtLeG4FWf3LWJlwq9InVbCVA2rvxp04fiK1VvKXRPKi3anphbnXNNIzu0G?= =?us-ascii?Q?+vFxaU7EvVckTtvPWMa9YZRcDwtJnm5Fdt8j+Ny391oqS536cW5Yy7HJct91?= =?us-ascii?Q?HzvPLTQCtQf9cwmu+g=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR05MB1303; 6:pWCSUYYtV/OwzNMOXnbMYqZVb/MSTnHgOwireCG6aIzQqBoAAcadiN1SGBpJd+Z/oZVio9qOxcxz8rB5EUX2uR0Kp81wxhI7B73c0O1eZNy/8Fnha+rhQTzpHDQbg0cTMQa8ZheatSJIe4usr/6ybxTziVa1l9E0rZBgkjV5fDITackr8+0HeLP/yHcrJ+HXUrH2oCKZaVv1/KZUYAAKGC7rIpCus9jM2qMyvDzNJDyKusMAJzQhUWhM04kWwrcNnrdaxmW+GP8vA+1x/iusG2mPrMOTFHk9kGGFJYj654fk5AQHCAoegj0Ec/YUWvArytgDjBXjhKJ8K/cFd2opnIgVVI5L0J/J9wPqRWiuko1lLP9UpllusfXYvvv53IksdgIjbavko53XWcGajMUa74pMdXcflxfTjX2I71MX+t4=; 5:1xcEFErVsaf7mcFmSc8uh+LZJS3a3xvjz8TJfTAwvfRvLJ4dbGXFEHqGscpPwjuit4EP0nqNMAj2rMuuNYlxR5YwJ5ldkJfMQXEHuqMcPrFeje1F6SJhILYk1jSMELPYfhK/APD/++LsCNPLOX1GCw==; 24:tmQoS28xNaoBJV/WS7iWJy4jJsurEPck0+BO0BNxTWu+3vE8qPqaiJWMUrophYWEHNZasnPwNnUaQY/EfGX/lpDMoXaeLLov5v47ZObrp8A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR05MB1303; 7:w/waPMOZjrCvCIMISzuZA+S3BR6wkoadBLDtRRiuHYKafMVN6kZeT8xvWNjUmHb3DTMvFueNOb9FXNo/2EwXV0dva4RVTBV8NM+OStwmFLvYJQz1sUB7KcYeq3bxP+xXH7VVSzVnwgyAXSiqqULnGJ/eCkiYucQFD+OVdVPW0xwE18RLb8IPvg0I+epcaDIlNQGYAFv0DUXe993PidkSYsqIjP01FkAhuRshvAfzf77k0XehHf2OYQdlHe+Z1r1et3jJBXktTQQcC5Ikipy/j3Auf+Y5TAbRjXv4IsLzYx63j1KW6n9Vhn9f4e12BCpT7qO5oCT5pJp0MZychnz3hQ== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 11:57:50.2060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1303 X-Mailman-Approved-At: Wed, 01 Mar 2017 12:12:14 +0000 Cc: ferasda@mellanox.com, talatb@mellanox.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com |
Applied to xenial master-next branch. Thanks. Cascardo.
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 5dca77e..896537d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1402,7 +1402,16 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) goto err_undo_flags; } - if (slave_ops->ndo_set_mac_address == NULL) { + if (slave_dev->type == ARPHRD_INFINIBAND && + BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) { + netdev_warn(bond_dev, "Type (%d) supports only active-backup mode\n", + slave_dev->type); + res = -EOPNOTSUPP; + goto err_undo_flags; + } + + if (!slave_ops->ndo_set_mac_address || + slave_dev->type == ARPHRD_INFINIBAND) { netdev_warn(bond_dev, "The slave device specified does not support setting the MAC address\n"); if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP && bond->params.fail_over_mac != BOND_FOM_ACTIVE) {