package/kernel/mac80211/patches/319-0024-brcmfmac-remove-worker-from-.ndo_set_mac_address-cal.patch

   1 From 8fa5fdec09cd379c9ecb8972f344f8f308e0ccf3 Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Mon, 19 Sep 2016 12:09:55 +0100
   4 Subject: [PATCH] brcmfmac: remove worker from .ndo_set_mac_address() callback
   5
   6 As it turns out there is no need to use a worker for the callback
   7 because it is not called from atomic context.
   8
   9 Reported-by: Dan Williams <dcbw@redhat.com>
  10 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  11 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  12 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  13 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15 ---
  16  .../wireless/broadcom/brcm80211/brcmfmac/core.c    | 39 ++++++++--------------
  17  .../wireless/broadcom/brcm80211/brcmfmac/core.h    |  2 --
  18  2 files changed, 13 insertions(+), 28 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  22 @@ -136,27 +136,6 @@ static void _brcmf_set_multicast_list(st
  23                           err);
  24  }
  25
  26 -static void
  27 -_brcmf_set_mac_address(struct work_struct *work)
  28 -{
  29 -       struct brcmf_if *ifp;
  30 -       s32 err;
  31 -
  32 -       ifp = container_of(work, struct brcmf_if, setmacaddr_work);
  33 -
  34 -       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
  35 -
  36 -       err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", ifp->mac_addr,
  37 -                                      ETH_ALEN);
  38 -       if (err < 0) {
  39 -               brcmf_err("Setting cur_etheraddr failed, %d\n", err);
  40 -       } else {
  41 -               brcmf_dbg(TRACE, "MAC address updated to %pM\n",
  42 -                         ifp->mac_addr);
  43 -               memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
  44 -       }
  45 -}
  46 -
  47  #if IS_ENABLED(CONFIG_IPV6)
  48  static void _brcmf_update_ndtable(struct work_struct *work)
  49  {
  50 @@ -190,10 +169,20 @@ static int brcmf_netdev_set_mac_address(
  51  {
  52         struct brcmf_if *ifp = netdev_priv(ndev);
  53         struct sockaddr *sa = (struct sockaddr *)addr;
  54 +       int err;
  55
  56 -       memcpy(&ifp->mac_addr, sa->sa_data, ETH_ALEN);
  57 -       schedule_work(&ifp->setmacaddr_work);
  58 -       return 0;
  59 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
  60 +
  61 +       err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,
  62 +                                      ETH_ALEN);
  63 +       if (err < 0) {
  64 +               brcmf_err("Setting cur_etheraddr failed, %d\n", err);
  65 +       } else {
  66 +               brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
  67 +               memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
  68 +               memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
  69 +       }
  70 +       return err;
  71  }
  72
  73  static void brcmf_netdev_set_multicast_list(struct net_device *ndev)
  74 @@ -525,7 +514,6 @@ int brcmf_net_attach(struct brcmf_if *if
  75         /* set the mac address */
  76         memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
  77
  78 -       INIT_WORK(&ifp->setmacaddr_work, _brcmf_set_mac_address);
  79         INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
  80         INIT_WORK(&ifp->ndoffload_work, _brcmf_update_ndtable);
  81
  82 @@ -730,7 +718,6 @@ static void brcmf_del_if(struct brcmf_pu
  83                 }
  84
  85                 if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
  86 -                       cancel_work_sync(&ifp->setmacaddr_work);
  87                         cancel_work_sync(&ifp->multicast_work);
  88                         cancel_work_sync(&ifp->ndoffload_work);
  89                 }
  90 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
  91 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
  92 @@ -176,7 +176,6 @@ enum brcmf_netif_stop_reason {
  93   * @vif: points to cfg80211 specific interface information.
  94   * @ndev: associated network device.
  95   * @stats: interface specific network statistics.
  96 - * @setmacaddr_work: worker object for setting mac address.
  97   * @multicast_work: worker object for multicast provisioning.
  98   * @ndoffload_work: worker object for neighbor discovery offload configuration.
  99   * @fws_desc: interface specific firmware-signalling descriptor.
 100 @@ -193,7 +192,6 @@ struct brcmf_if {
 101         struct brcmf_cfg80211_vif *vif;
 102         struct net_device *ndev;
 103         struct net_device_stats stats;
 104 -       struct work_struct setmacaddr_work;
 105         struct work_struct multicast_work;
 106         struct work_struct ndoffload_work;
 107         struct brcmf_fws_mac_descriptor *fws_desc;