8 files changed, 29 insertions, 48 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 6048fc1da1c2..5c217427a669 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2198,7 +2198,7 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
                                 pkt_dev->curfl = 0; /*reset */
                 }
         } else {
-                flow = random32() % pkt_dev->cflows;
+                flow = prandom_u32() % pkt_dev->cflows;
                 pkt_dev->curfl = flow;
 
                 if (pkt_dev->flows[flow].count > pkt_dev->lflow) {
@@ -2246,7 +2246,7 @@ static void set_cur_queue_map(struct pktgen_dev *pkt_dev)
         else if (pkt_dev->queue_map_min <= pkt_dev->queue_map_max) {
                 __u16 t;
                 if (pkt_dev->flags & F_QUEUE_MAP_RND) {
-                        t = random32() %
+                        t = prandom_u32() %
                                 (pkt_dev->queue_map_max -
                                  pkt_dev->queue_map_min + 1)
                                 + pkt_dev->queue_map_min;
@@ -2278,7 +2278,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                 __u32 tmp;
 
                 if (pkt_dev->flags & F_MACSRC_RND)
-                        mc = random32() % pkt_dev->src_mac_count;
+                        mc = prandom_u32() % pkt_dev->src_mac_count;
                 else {
                         mc = pkt_dev->cur_src_mac_offset++;
                         if (pkt_dev->cur_src_mac_offset >=
@@ -2304,7 +2304,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                 __u32 tmp;
 
                 if (pkt_dev->flags & F_MACDST_RND)
-                        mc = random32() % pkt_dev->dst_mac_count;
+                        mc = prandom_u32() % pkt_dev->dst_mac_count;
 
                 else {
                         mc = pkt_dev->cur_dst_mac_offset++;
@@ -2331,21 +2331,21 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                 for (i = 0; i < pkt_dev->nr_labels; i++)
                         if (pkt_dev->labels[i] & MPLS_STACK_BOTTOM)
                                 pkt_dev->labels[i] = MPLS_STACK_BOTTOM |
-                                             ((__force __be32)random32() &
+                                             ((__force __be32)prandom_u32() &
                                                       htonl(0x000fffff));
         }
 
         if ((pkt_dev->flags & F_VID_RND) && (pkt_dev->vlan_id != 0xffff)) {
-                pkt_dev->vlan_id = random32() & (4096-1);
+                pkt_dev->vlan_id = prandom_u32() & (4096 - 1);
         }
 
         if ((pkt_dev->flags & F_SVID_RND) && (pkt_dev->svlan_id != 0xffff)) {
-                pkt_dev->svlan_id = random32() & (4096 - 1);
+                pkt_dev->svlan_id = prandom_u32() & (4096 - 1);
         }
 
         if (pkt_dev->udp_src_min < pkt_dev->udp_src_max) {
                 if (pkt_dev->flags & F_UDPSRC_RND)
-                        pkt_dev->cur_udp_src = random32() %
+                        pkt_dev->cur_udp_src = prandom_u32() %
                                 (pkt_dev->udp_src_max - pkt_dev->udp_src_min)
                                 + pkt_dev->udp_src_min;
 
@@ -2358,7 +2358,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
 
         if (pkt_dev->udp_dst_min < pkt_dev->udp_dst_max) {
                 if (pkt_dev->flags & F_UDPDST_RND) {
-                        pkt_dev->cur_udp_dst = random32() %
+                        pkt_dev->cur_udp_dst = prandom_u32() %
                                 (pkt_dev->udp_dst_max - pkt_dev->udp_dst_min)
                                 + pkt_dev->udp_dst_min;
                 } else {
@@ -2375,7 +2375,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                 if (imn < imx) {
                         __u32 t;
                         if (pkt_dev->flags & F_IPSRC_RND)
-                                t = random32() % (imx - imn) + imn;
+                                t = prandom_u32() % (imx - imn) + imn;
                         else {
                                 t = ntohl(pkt_dev->cur_saddr);
                                 t++;
@@ -2396,17 +2396,15 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                                 __be32 s;
                                 if (pkt_dev->flags & F_IPDST_RND) {
 
-                                        t = random32() % (imx - imn) + imn;
-                                        s = htonl(t);
-
-                                        while (ipv4_is_loopback(s) ||
-                                               ipv4_is_multicast(s) ||
-                                               ipv4_is_lbcast(s) ||
-                                               ipv4_is_zeronet(s) ||
-                                               ipv4_is_local_multicast(s)) {
-                                                t = random32() % (imx - imn) + imn;
+                                        do {
+                                                t = prandom_u32() %
+                                                        (imx - imn) + imn;
                                                 s = htonl(t);
-                                        }
+                                        } while (ipv4_is_loopback(s) ||
+                                                ipv4_is_multicast(s) ||
+                                                ipv4_is_lbcast(s) ||
+                                                ipv4_is_zeronet(s) ||
+                                                ipv4_is_local_multicast(s));
                                         pkt_dev->cur_daddr = s;
                                 } else {
                                         t = ntohl(pkt_dev->cur_daddr);
@@ -2437,7 +2435,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
 
                         for (i = 0; i < 4; i++) {
                                 pkt_dev->cur_in6_daddr.s6_addr32[i] =
-                                    (((__force __be32)random32() |
+                                    (((__force __be32)prandom_u32() |
                                       pkt_dev->min_in6_daddr.s6_addr32[i]) &
                                      pkt_dev->max_in6_daddr.s6_addr32[i]);
                         }
@@ -2447,7 +2445,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
         if (pkt_dev->min_pkt_size < pkt_dev->max_pkt_size) {
                 __u32 t;
                 if (pkt_dev->flags & F_TXSIZE_RND) {
-                        t = random32() %
+                        t = prandom_u32() %
                                 (pkt_dev->max_pkt_size - pkt_dev->min_pkt_size)
                                 + pkt_dev->min_pkt_size;
                 } else {
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 362ba47968e4..41ac7938268b 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -328,7 +328,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         spin_unlock_irqrestore(&port->lock, flags);
 
         while (1) {
-                if (tty->termios.c_cflag & CBAUD)
+                if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags))
                         tty_port_raise_dtr_rts(port);
 
                 set_current_state(TASK_INTERRUPTIBLE);
diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index edab393e0c82..a2a508f5f268 100644
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -997,12 +997,8 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
                         self->settings.dce = IRCOMM_DELTA_CD;
                         ircomm_tty_check_modem_status(self);
                 } else {
-                        struct tty_struct *tty = tty_port_tty_get(&self->port);
                         IRDA_DEBUG(0, "%s(), hanging up!\n", __func__ );
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
+                        tty_port_tty_hangup(&self->port, false);
                 }
                 break;
         default:
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index c8e001a9c45b..f84965af4a4e 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -264,7 +264,7 @@ static void death_by_event(unsigned long ul_conntrack)
         if (nf_conntrack_event(IPCT_DESTROY, ct) < 0) {
                 /* bad luck, let's retry again */
                 ecache->timeout.expires = jiffies +
-                        (random32() % net->ct.sysctl_events_retry_timeout);
+                        (prandom_u32() % net->ct.sysctl_events_retry_timeout);
                 add_timer(&ecache->timeout);
                 return;
         }
@@ -283,7 +283,7 @@ void nf_ct_dying_timeout(struct nf_conn *ct)
         /* set a new timer to retry event delivery */
         setup_timer(&ecache->timeout, death_by_event, (unsigned long)ct);
         ecache->timeout.expires = jiffies +
-                (random32() % net->ct.sysctl_events_retry_timeout);
+                (prandom_u32() % net->ct.sysctl_events_retry_timeout);
         add_timer(&ecache->timeout);
 }
 EXPORT_SYMBOL_GPL(nf_ct_dying_timeout);
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index cc37dd52ecf9..ef53ab8d0aae 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -80,7 +80,7 @@ struct choke_sched_data {
 /* deliver a random number between 0 and N - 1 */
 static u32 random_N(unsigned int N)
 {
-        return reciprocal_divide(random32(), N);
+        return reciprocal_divide(prandom_u32(), N);
 }
 
 /* number of elements in queue including holes */
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index d2709e2b7be6..fa261a3594c2 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -66,13 +66,6 @@ static void sctp_assoc_bh_rcv(struct work_struct *work);
 static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc);
 static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc);
 
-/* Keep track of the new idr low so that we don't re-use association id
- * numbers too fast.  It is protected by they idr spin lock is in the
- * range of 1 - INT_MAX.
- */
-static u32 idr_low = 1;
-
-
 /* 1st Level Abstractions. */
 
 /* Initialize a new association from provided memory. */
@@ -1601,13 +1594,8 @@ int sctp_assoc_set_id(struct sctp_association *asoc, gfp_t gfp)
         if (preload)
                 idr_preload(gfp);
         spin_lock_bh(&sctp_assocs_id_lock);
-        /* 0 is not a valid id, idr_low is always >= 1 */
-        ret = idr_alloc(&sctp_assocs_id, asoc, idr_low, 0, GFP_NOWAIT);
-        if (ret >= 0) {
-                idr_low = ret + 1;
-                if (idr_low == INT_MAX)
-                        idr_low = 1;
-        }
+        /* 0 is not a valid assoc_id, must be >= 1 */
+        ret = idr_alloc_cyclic(&sctp_assocs_id, asoc, 1, 0, GFP_NOWAIT);
         spin_unlock_bh(&sctp_assocs_id_lock);
         if (preload)
                 idr_preload_end();
diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index 88edec929d73..1da52d1406fc 100644
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -130,8 +130,8 @@ gss_krb5_make_confounder(char *p, u32 conflen)
 
         /* initialize to random value */
         if (i == 0) {
-                i = random32();
-                i = (i << 32) | random32();
+                i = prandom_u32();
+                i = (i << 32) | prandom_u32();
         }
 
         switch (conflen) {
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 25d58e766014..ce2d180d05a4 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1208,7 +1208,6 @@ EXPORT_SYMBOL_GPL(sunrpc_cache_pipe_upcall);
  * key and content are both parsed by cache
  */
 
-#define isodigit(c) (isdigit(c) && c <= '7')
 int qword_get(char **bpp, char *dest, int bufsize)
 {
         /* return bytes copied, or -1 on error */