Replace local random function with random32()
Subsystems (2)
Signed-off-by Joe Perches <[email protected]>
Signed-off-by Ralf Baechle <[email protected]>
drivers/net/hamradio/baycom_epp.c +2 -11
@@ -52,6 +52,7 @@#include <linux/hdlcdrv.h> #include <linux/baycom.h> #include <linux/jiffies.h> +#include <linux/random.h> #include <net/ax25.h> #include <asm/uaccess.h>
@@ -433,16 +434,6 @@ static void encode_hdlc(struct baycom_state *bc)/* ---------------------------------------------------------------------- */ -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} - -/* ---------------------------------------------------------------------- */ -static int transmit (struct baycom_state *bc,int cnt,unsigned char stat) {struct parport *pp = bc->pdev->port;
@@ -464,7 +455,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)if ((--bc->hdlctx.slotcnt) >0 )return 0 ; bc->hdlctx.slotcnt = bc->ch_params.slottime; -if ((random_num () %256 ) > bc->ch_params.ppersist) +if ((random32 () %256 ) > bc->ch_params.ppersist)return 0 ; } }
drivers/net/hamradio/hdlcdrv.c +2 -11
@@ -56,6 +56,7 @@#include <linux/if_arp.h> #include <linux/skbuff.h> #include <linux/hdlcdrv.h> +#include <linux/random.h> #include <net/ax25.h> #include <asm/uaccess.h>
@@ -371,16 +372,6 @@ static void start_tx(struct net_device *dev, struct hdlcdrv_state *s)/* ---------------------------------------------------------------------- */ -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} - -/* ---------------------------------------------------------------------- */ -void hdlcdrv_arbitrate (struct net_device *dev,struct hdlcdrv_state *s) {if (!s || s->magic !=HDLCDRV_MAGIC || s->hdlctx.ptt || !s->skb)
@@ -396,7 +387,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)if ((--s->hdlctx.slotcnt) >0 )return ; s->hdlctx.slotcnt = s->ch_params.slottime; -if ((random_num () %256 ) > s->ch_params.ppersist) +if ((random32 () %256 ) > s->ch_params.ppersist)return ;start_tx (dev, s); }
drivers/net/hamradio/yam.c +2 -9
@@ -50,6 +50,7 @@#include <linux/slab.h> #include <linux/errno.h> #include <linux/bitops.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/system.h> #include <linux/interrupt.h>
@@ -566,14 +567,6 @@ static void yam_start_tx(struct net_device *dev, struct yam_port *yp)ptt_on (dev); } -static unsigned short random_seed; - -static inline unsigned short random_num (void ) -{ - random_seed =28629 * random_seed +157 ; -return random_seed; -} -static void yam_arbitrate (struct net_device *dev) {struct yam_port *yp =netdev_priv (dev);
@@ -600,7 +593,7 @@ static void yam_arbitrate(struct net_device *dev) yp->slotcnt = yp->slot /10 ;/* is random > persist ? */ -if ((random_num () %256 ) > yp->pers) +if ((random32 () %256 ) > yp->pers)return ;yam_start_tx (dev, yp);
Thomas Sailer
Acked-byQuoted 2 lines · Ralf Baechle
Signed-off-by Joe Perches <[email protected]>Signed-off-by Ralf Baechle <[email protected]>
Acked-by Thomas Sailer <[email protected]>
Jeff Garzik
AppliedQuoted 2 lines · Ralf Baechle
Signed-off-by Joe Perches <[email protected]>Signed-off-by Ralf Baechle <[email protected]>
applied