summaryrefslogtreecommitdiff
path: root/include/net.h
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-04-08 01:41:21 -0500
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:35 -0600
commitbc0571fc1067ff8a8fd16990ae65c1a2826ea90c (patch)
tree1381f5ebd824a415652755afd5adc65d362071b9 /include/net.h
parenta34f2075633d7928e2988193b0caba5854e6ef20 (diff)
downloadu-boot-bc0571fc1067ff8a8fd16990ae65c1a2826ea90c.tar.gz
net: cosmetic: Fix checkpatch.pl failures in net.c
Finish eliminating CamelCase from net.c and other failures Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/net.h')
-rw-r--r--include/net.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/include/net.h b/include/net.h
index 73fa04f2be..4488cc7d65 100644
--- a/include/net.h
+++ b/include/net.h
@@ -485,7 +485,6 @@ extern uchar *net_tx_packet; /* THE transmit packet */
extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */
extern uchar *net_rx_packet; /* Current receive packet */
extern int net_rx_packet_len; /* Current rx packet length */
-extern unsigned NetIPID; /* IP ID (counting) */
extern const u8 net_bcast_ethaddr[6]; /* Ethernet broadcast address */
extern const u8 net_null_ethaddr[6];
@@ -494,7 +493,7 @@ extern const u8 net_null_ethaddr[6];
extern ushort net_our_vlan; /* Our VLAN */
extern ushort net_native_vlan; /* Our Native VLAN */
-extern int NetRestartWrap; /* Tried all network devices */
+extern int net_restart_wrap; /* Tried all network devices */
enum proto_t {
BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
@@ -534,7 +533,7 @@ static inline int is_cdp_packet(const uchar *ethaddr)
#if defined(CONFIG_CMD_SNTP)
extern struct in_addr net_ntp_server; /* the ip address to NTP */
-extern int NetTimeOffset; /* offset time from UTC */
+extern int net_ntp_time_offset; /* offset time from UTC */
#endif
#if defined(CONFIG_MCAST_TFTP)
@@ -543,13 +542,10 @@ extern struct in_addr net_mcast_addr;
/* Initialize the network adapter */
void net_init(void);
-int NetLoop(enum proto_t);
-
-/* Shutdown adapters and cleanup */
-void NetStop(void);
+int net_loop(enum proto_t);
/* Load failed. Start again. */
-int NetStartAgain(void);
+int net_start_again(void);
/* Get size of the ethernet header when we send */
int net_eth_hdr_size(void);
@@ -599,7 +595,7 @@ void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */
rxhand_f *net_get_arp_handler(void); /* Get ARP RX packet handler */
void net_set_arp_handler(rxhand_f *); /* Set ARP RX packet handler */
void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */
-void NetSetTimeout(ulong, thand_f *);/* Set timeout handler */
+void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */
/* Network loop state */
enum net_loop_state {
@@ -688,7 +684,7 @@ static inline struct in_addr net_read_ip(void *from)
}
/* return ulong *in network byteorder* */
-static inline ulong NetReadLong(ulong *from)
+static inline ulong net_read_long(ulong *from)
{
ulong l;
@@ -709,7 +705,7 @@ static inline void net_copy_ip(void *to, void *from)
}
/* copy ulong */
-static inline void NetCopyLong(ulong *to, ulong *from)
+static inline void net_copy_long(ulong *to, ulong *from)
{
memcpy((void *)to, (void *)from, sizeof(ulong));
}