1 files changed, 42 insertions, 2 deletions

diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index 85fa59afae34..77e07ba3f493 100644
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -611,19 +611,59 @@ static int ncsi_rsp_handler_snfc(struct ncsi_request *nr)
         return 0;
 }
 
+/* Response handler for Broadcom command Get Mac Address */
+static int ncsi_rsp_handler_oem_bcm_gma(struct ncsi_request *nr)
+{
+        struct ncsi_dev_priv *ndp = nr->ndp;
+        struct net_device *ndev = ndp->ndev.dev;
+        const struct net_device_ops *ops = ndev->netdev_ops;
+        struct ncsi_rsp_oem_pkt *rsp;
+        struct sockaddr saddr;
+        int ret = 0;
+
+        /* Get the response header */
+        rsp = (struct ncsi_rsp_oem_pkt *)skb_network_header(nr->rsp);
+
+        saddr.sa_family = ndev->type;
+        ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
+        memcpy(saddr.sa_data, &rsp->data[BCM_MAC_ADDR_OFFSET], ETH_ALEN);
+        /* Increase mac address by 1 for BMC's address */
+        saddr.sa_data[ETH_ALEN - 1]++;
+        ret = ops->ndo_set_mac_address(ndev, &saddr);
+        if (ret < 0)
+                netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
+
+        return ret;
+}
+
+/* Response handler for Broadcom card */
+static int ncsi_rsp_handler_oem_bcm(struct ncsi_request *nr)
+{
+        struct ncsi_rsp_oem_bcm_pkt *bcm;
+        struct ncsi_rsp_oem_pkt *rsp;
+
+        /* Get the response header */
+        rsp = (struct ncsi_rsp_oem_pkt *)skb_network_header(nr->rsp);
+        bcm = (struct ncsi_rsp_oem_bcm_pkt *)(rsp->data);
+
+        if (bcm->type == NCSI_OEM_BCM_CMD_GMA)
+                return ncsi_rsp_handler_oem_bcm_gma(nr);
+        return 0;
+}
+
 static struct ncsi_rsp_oem_handler {
         unsigned int    mfr_id;
         int             (*handler)(struct ncsi_request *nr);
 } ncsi_rsp_oem_handlers[] = {
         { NCSI_OEM_MFR_MLX_ID, NULL },
-        { NCSI_OEM_MFR_BCM_ID, NULL }
+        { NCSI_OEM_MFR_BCM_ID, ncsi_rsp_handler_oem_bcm }
 };
 
 /* Response handler for OEM command */
 static int ncsi_rsp_handler_oem(struct ncsi_request *nr)
 {
-        struct ncsi_rsp_oem_pkt *rsp;
         struct ncsi_rsp_oem_handler *nrh = NULL;
+        struct ncsi_rsp_oem_pkt *rsp;
         unsigned int mfr_id, i;
 
         /* Get the response header */