android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/net: rename random32() to prandom_u32()

Browse Source 
Use preferable function name which implies using a pseudo-random number
generator.

[akpm@linux-foundation.org: convert team_mode_random.c]
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Thomas Sailer <t.sailer@alumni.ethz.ch>
Acked-by: Bing Zhao <bzhao@marvell.com> [mwifiex]
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Michael Chan <mchan@broadcom.com>
Cc: Thomas Sailer <t.sailer@alumni.ethz.ch>
Cc: Jean-Paul Roubelat <jpr@f6fbb.org>
Cc: Bing Zhao <bzhao@marvell.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Cc: "Franky (Zhenhui) Lin" <frankyl@broadcom.com>
Cc: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Akinobu Mita 2013-05-07 16:18:15 -07:00 committed by Linus Torvalds
parent af73e4d950
commit e00adf3913
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/cnic.c
View File

@ -4085,7 +4085,7 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
if (!cp->csk_tbl) if (!cp->csk_tbl)
return -ENOMEM; return -ENOMEM;
port_id = random32(); port_id = prandom_u32();
port_id %= CNIC_LOCAL_PORT_RANGE; port_id %= CNIC_LOCAL_PORT_RANGE;
if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE, if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE,
CNIC_LOCAL_PORT_MIN, port_id)) { CNIC_LOCAL_PORT_MIN, port_id)) {
@ -4145,7 +4145,7 @@ static int cnic_cm_init_bnx2_hw(struct cnic_dev *dev)
{ {
u32 seed; u32 seed;
seed = random32(); seed = prandom_u32();
cnic_ctx_wr(dev, 45, 0, seed); cnic_ctx_wr(dev, 45, 0, seed);
return 0; return 0;
} }

2
drivers/net/hamradio/baycom_epp.c
View File

@ -449,7 +449,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)
if ((--bc->hdlctx.slotcnt) > 0) if ((--bc->hdlctx.slotcnt) > 0)
return 0; return 0;
bc->hdlctx.slotcnt = bc->ch_params.slottime; bc->hdlctx.slotcnt = bc->ch_params.slottime;
if ((random32() % 256) > bc->ch_params.ppersist) if ((prandom_u32() % 256) > bc->ch_params.ppersist)
return 0; return 0;
} }
} }

2
drivers/net/hamradio/hdlcdrv.c
View File

@ -389,7 +389,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)
if ((--s->hdlctx.slotcnt) > 0) if ((--s->hdlctx.slotcnt) > 0)
return; return;
s->hdlctx.slotcnt = s->ch_params.slottime; s->hdlctx.slotcnt = s->ch_params.slottime;
if ((random32() % 256) > s->ch_params.ppersist) if ((prandom_u32() % 256) > s->ch_params.ppersist)
return; return;
start_tx(dev, s); start_tx(dev, s);
} }

2
drivers/net/hamradio/yam.c
View File

@ -638,7 +638,7 @@ static void yam_arbitrate(struct net_device *dev)
yp->slotcnt = yp->slot / 10; yp->slotcnt = yp->slot / 10;
/* is random > persist ? */ /* is random > persist ? */
if ((random32() % 256) > yp->pers) if ((prandom_u32() % 256) > yp->pers)
return; return;
yam_start_tx(dev, yp); yam_start_tx(dev, yp);

2
drivers/net/team/team_mode_random.c
View File

@ -18,7 +18,7 @@
static u32 random_N(unsigned int N) static u32 random_N(unsigned int N)
{ {
return reciprocal_divide(random32(), N); return reciprocal_divide(prandom_u32(), N);
} }
static bool rnd_transmit(struct team *team, struct sk_buff *skb) static bool rnd_transmit(struct team *team, struct sk_buff *skb)

2
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
View File

@ -1117,7 +1117,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)
if (afx_hdl->is_listen && afx_hdl->my_listen_chan) if (afx_hdl->is_listen && afx_hdl->my_listen_chan)
/* 100ms ~ 300ms */ /* 100ms ~ 300ms */
err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan, err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan,
100 * (1 + (random32() % 3))); 100 * (1 + prandom_u32() % 3));
else else
err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan); err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);

4
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -216,7 +216,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
mwifiex_form_mgmt_frame(skb, buf, len); mwifiex_form_mgmt_frame(skb, buf, len);
mwifiex_queue_tx_pkt(priv, skb); mwifiex_queue_tx_pkt(priv, skb);
*cookie = random32() | 1; *cookie = prandom_u32() | 1;
cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC); cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC);
wiphy_dbg(wiphy, "info: management frame transmitted\n"); wiphy_dbg(wiphy, "info: management frame transmitted\n");
@ -271,7 +271,7 @@ mwifiex_cfg80211_remain_on_channel(struct wiphy *wiphy,
duration); duration);
if (!ret) { if (!ret) {
*cookie = random32() | 1; *cookie = prandom_u32() | 1;
priv->roc_cfg.cookie = *cookie; priv->roc_cfg.cookie = *cookie;
priv->roc_cfg.chan = *chan; priv->roc_cfg.chan = *chan;