The patch titled Subject: drivers/net: rename random32() to prandom_u32() has been removed from the -mm tree. Its filename was drivers-net-rename-random32-to-prandom_u32.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Subject: drivers/net: rename random32() to prandom_u32() Use preferable function name which implies using a pseudo-random number generator. [akpm@xxxxxxxxxxxxxxxxxxxx: convert team_mode_random.c] Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Acked-by: Thomas Sailer <t.sailer@xxxxxxxxxxxxxx> Acked-by: Bing Zhao <bzhao@xxxxxxxxxxx> [mwifiex] Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Michael Chan <mchan@xxxxxxxxxxxx> Cc: Thomas Sailer <t.sailer@xxxxxxxxxxxxxx> Cc: Jean-Paul Roubelat <jpr@xxxxxxxxx> Cc: Bing Zhao <bzhao@xxxxxxxxxxx> Cc: Brett Rudley <brudley@xxxxxxxxxxxx> Cc: Arend van Spriel <arend@xxxxxxxxxxxx> Cc: "Franky (Zhenhui) Lin" <frankyl@xxxxxxxxxxxx> Cc: Hante Meuleman <meuleman@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/broadcom/cnic.c | 4 ++-- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/team/team_mode_random.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- drivers/net/wireless/mwifiex/cfg80211.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff -puN drivers/net/ethernet/broadcom/cnic.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/ethernet/broadcom/cnic.c --- a/drivers/net/ethernet/broadcom/cnic.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/ethernet/broadcom/cnic.c @@ -4085,7 +4085,7 @@ static int cnic_cm_alloc_mem(struct cnic if (!cp->csk_tbl) return -ENOMEM; - port_id = random32(); + port_id = prandom_u32(); port_id %= CNIC_LOCAL_PORT_RANGE; if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE, CNIC_LOCAL_PORT_MIN, port_id)) { @@ -4145,7 +4145,7 @@ static int cnic_cm_init_bnx2_hw(struct c { u32 seed; - seed = random32(); + seed = prandom_u32(); cnic_ctx_wr(dev, 45, 0, seed); return 0; } diff -puN drivers/net/hamradio/baycom_epp.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/hamradio/baycom_epp.c --- a/drivers/net/hamradio/baycom_epp.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/hamradio/baycom_epp.c @@ -449,7 +449,7 @@ static int transmit(struct baycom_state if ((--bc->hdlctx.slotcnt) > 0) return 0; bc->hdlctx.slotcnt = bc->ch_params.slottime; - if ((random32() % 256) > bc->ch_params.ppersist) + if ((prandom_u32() % 256) > bc->ch_params.ppersist) return 0; } } diff -puN drivers/net/hamradio/hdlcdrv.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/hamradio/hdlcdrv.c --- a/drivers/net/hamradio/hdlcdrv.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/hamradio/hdlcdrv.c @@ -389,7 +389,7 @@ void hdlcdrv_arbitrate(struct net_device if ((--s->hdlctx.slotcnt) > 0) return; s->hdlctx.slotcnt = s->ch_params.slottime; - if ((random32() % 256) > s->ch_params.ppersist) + if ((prandom_u32() % 256) > s->ch_params.ppersist) return; start_tx(dev, s); } diff -puN drivers/net/hamradio/yam.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/hamradio/yam.c --- a/drivers/net/hamradio/yam.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/hamradio/yam.c @@ -638,7 +638,7 @@ static void yam_arbitrate(struct net_dev yp->slotcnt = yp->slot / 10; /* is random > persist ? */ - if ((random32() % 256) > yp->pers) + if ((prandom_u32() % 256) > yp->pers) return; yam_start_tx(dev, yp); diff -puN drivers/net/team/team_mode_random.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/team/team_mode_random.c --- a/drivers/net/team/team_mode_random.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/team/team_mode_random.c @@ -18,7 +18,7 @@ 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) diff -puN drivers/net/wireless/brcm80211/brcmfmac/p2p.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/wireless/brcm80211/brcmfmac/p2p.c --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -1117,7 +1117,7 @@ static void brcmf_p2p_afx_handler(struct if (afx_hdl->is_listen && afx_hdl->my_listen_chan) /* 100ms ~ 300ms */ err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan, - 100 * (1 + (random32() % 3))); + 100 * (1 + prandom_u32() % 3)); else err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan); diff -puN drivers/net/wireless/mwifiex/cfg80211.c~drivers-net-rename-random32-to-prandom_u32 drivers/net/wireless/mwifiex/cfg80211.c --- a/drivers/net/wireless/mwifiex/cfg80211.c~drivers-net-rename-random32-to-prandom_u32 +++ a/drivers/net/wireless/mwifiex/cfg80211.c @@ -216,7 +216,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *w mwifiex_form_mgmt_frame(skb, buf, len); mwifiex_queue_tx_pkt(priv, skb); - *cookie = random32() | 1; + *cookie = prandom_u32() | 1; cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC); wiphy_dbg(wiphy, "info: management frame transmitted\n"); @@ -271,7 +271,7 @@ mwifiex_cfg80211_remain_on_channel(struc duration); if (!ret) { - *cookie = random32() | 1; + *cookie = prandom_u32() | 1; priv->roc_cfg.cookie = *cookie; priv->roc_cfg.chan = *chan; _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html