diff mbox series

net: move random_port() to dns

Message ID 83500b82aabf2d10a965c576e05993ff156a151a.1589970701.git.baruch@tkos.co.il
State Accepted
Commit f1d925d9c39628d346b3809408695cd5c8b8faa2
Headers show
Series net: move random_port() to dns | expand

Commit Message

Baruch Siach May 20, 2020, 10:31 a.m. UTC 
The random_port() routine is not used anywhere else. Make it local to
dns.c to reduce code clutter, and shrink generated code a little.

Signed-off-by: Baruch Siach <baruch at tkos.co.il>
---
 include/net.h |  3 ---
 net/dns.c     | 10 ++++++++++
 net/net.c     | 14 --------------
 3 files changed, 10 insertions(+), 17 deletions(-)
diff mbox series

Patch

diff --git a/include/net.h b/include/net.h
index 82500eeb30f7..a5030b395fb6 100644
--- a/include/net.h
+++ b/include/net.h
@@ -890,9 +890,6 @@  int is_serverip_in_cmd(void);
  */
 int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len);
 
-/* get a random source port */
-unsigned int random_port(void);
-
 /**
  * update_tftp - Update firmware over TFTP (via DFU)
  *
diff --git a/net/dns.c b/net/dns.c
index 67d761d7c0f5..dfcd0b85c875 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -35,6 +35,16 @@  char *net_dns_env_var;	/* The envvar to store the answer in */
 
 static int dns_our_port;
 
+/*
+ * make port a little random (1024-17407)
+ * This keeps the math somewhat trivial to compute, and seems to work with
+ * all supported protocols/clients/servers
+ */
+static unsigned int random_port(void)
+{
+	return 1024 + (get_timer(0) % 0x4000);
+}
+
 static void dns_send(void)
 {
 	struct header *header;
diff --git a/net/net.c b/net/net.c
index a76e16b41654..0a42db0a19fb 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1539,20 +1539,6 @@  int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len)
 	return 1;
 }
 
-#if	defined(CONFIG_CMD_NFS)		|| \
-	defined(CONFIG_CMD_SNTP)	|| \
-	defined(CONFIG_CMD_DNS)
-/*
- * make port a little random (1024-17407)
- * This keeps the math somewhat trivial to compute, and seems to work with
- * all supported protocols/clients/servers
- */
-unsigned int random_port(void)
-{
-	return 1024 + (get_timer(0) % 0x4000);
-}
-#endif
-
 void ip_to_string(struct in_addr x, char *s)
 {
 	x.s_addr = ntohl(x.s_addr);