package/mac80211/patches/050-drivers-net-rename-random32-to-prandom_u32.patch

   1 From e00adf39134028d65023c327b427074728c18f7e Mon Sep 17 00:00:00 2001
   2 From: Akinobu Mita <akinobu.mita@gmail.com>
   3 Date: Tue, 7 May 2013 16:18:15 -0700
   4 Subject: [PATCH] drivers/net: rename random32() to prandom_u32()
   5
   6 Use preferable function name which implies using a pseudo-random number
   7 generator.
   8
   9 [akpm@linux-foundation.org: convert team_mode_random.c]
  10 Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
  11 Acked-by: Thomas Sailer <t.sailer@alumni.ethz.ch>
  12 Acked-by: Bing Zhao <bzhao@marvell.com> [mwifiex]
  13 Cc: "David S. Miller" <davem@davemloft.net>
  14 Cc: Michael Chan <mchan@broadcom.com>
  15 Cc: Thomas Sailer <t.sailer@alumni.ethz.ch>
  16 Cc: Jean-Paul Roubelat <jpr@f6fbb.org>
  17 Cc: Bing Zhao <bzhao@marvell.com>
  18 Cc: Brett Rudley <brudley@broadcom.com>
  19 Cc: Arend van Spriel <arend@broadcom.com>
  20 Cc: "Franky (Zhenhui) Lin" <frankyl@broadcom.com>
  21 Cc: Hante Meuleman <meuleman@broadcom.com>
  22 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  23 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24 ---
  25  drivers/net/wireless/brcm80211/brcmfmac/p2p.c |    2 +-
  26  drivers/net/wireless/mwifiex/cfg80211.c       |    4 ++--
  27  2 files changed, 3 insertions(+), 3 deletions(-)
  28
  29 diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  30 index 2b90da0..e7a1a47 100644
  31 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  32 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  33 @@ -1117,7 +1117,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)
  34         if (afx_hdl->is_listen && afx_hdl->my_listen_chan)
  35                 /* 100ms ~ 300ms */
  36                 err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan,
  37 -                                               100 * (1 + (random32() % 3)));
  38 +                                               100 * (1 + prandom_u32() % 3));
  39         else
  40                 err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);
  41
  42 diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
  43 index a0cb077..d3c8ece 100644
  44 --- a/drivers/net/wireless/mwifiex/cfg80211.c
  45 +++ b/drivers/net/wireless/mwifiex/cfg80211.c
  46 @@ -216,7 +216,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
  47         mwifiex_form_mgmt_frame(skb, buf, len);
  48         mwifiex_queue_tx_pkt(priv, skb);
  49
  50 -       *cookie = random32() | 1;
  51 +       *cookie = prandom_u32() | 1;
  52         cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC);
  53
  54         wiphy_dbg(wiphy, "info: management frame transmitted\n");
  55 @@ -271,7 +271,7 @@ mwifiex_cfg80211_remain_on_channel(struct wiphy *wiphy,
  56                                          duration);
  57
  58         if (!ret) {
  59 -               *cookie = random32() | 1;
  60 +               *cookie = prandom_u32() | 1;
  61                 priv->roc_cfg.cookie = *cookie;
  62                 priv->roc_cfg.chan = *chan;
  63
  64 --
  65 1.7.10.4
  66