Revert "be2net: fix MAC addr setting on privileged BE3 VFs"

Orabug: 25870303

This reverts commit 08046feba4560c904950e6ad1a7a2c8f908a5100.

Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Reviewed-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 28c36cef50cf710a81f197c3ee995c7123ea9008..9d3763df771971aa13c544d09577280ec20e20b2 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -279,13 +279,6 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
        if (ether_addr_equal(addr->sa_data, adapter->dev_mac))
                return 0;
 
-       /* BE3 VFs without FILTMGMT privilege are not allowed to set its MAC
-        * address
-        */
-       if (BEx_chip(adapter) && be_virtfn(adapter) &&
-           !check_privilege(adapter, BE_PRIV_FILTMGMT))
-               return -EPERM;
-
        /* if device is not running, copy MAC to netdev->dev_addr */
        if (!netif_running(netdev))
                goto done;
@@ -3546,8 +3539,7 @@ static int be_enable_if_filters(struct be_adapter *adapter)
                return status;
 
        /* For BE3 VFs, the PF programs the initial MAC address */
-       if (!BEx_chip(adapter) || !be_virtfn(adapter) ||
-           check_privilege(adapter, BE_PRIV_FILTMGMT)) {
+       if (!(BEx_chip(adapter) && be_virtfn(adapter))) {
                status = be_cmd_pmac_add(adapter, adapter->netdev->dev_addr,
                                         adapter->if_handle,
                                         &adapter->pmac_id[0], 0);