dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-21 02:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: cosmetic: Fix checkpatch.pl failures in linklocal

Browse Source 
A few new rules in checkpatch.pl since linklocal.c was added.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger
2015-04-08 01:41:18 -05:00
committed by Simon Glass
parent 4fd5055f59
commit 8e7ff6773a
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net/link_local.c
View File

@@ -97,7 +97,7 @@ static void configure_wait(void)
deadline_ms = MONOTONIC_MS() + timeout_ms; deadline_ms = MONOTONIC_MS() + timeout_ms;
debug_cond(DEBUG_DEV_PKT, "...wait %d %s nprobes=%u, nclaims=%u\n", debug_cond(DEBUG_DEV_PKT, "...wait %d %s nprobes=%u, nclaims=%u\n",
timeout_ms, eth_get_name(), nprobes, nclaims); timeout_ms, eth_get_name(), nprobes, nclaims);
NetSetTimeout(timeout_ms, link_local_timeout); NetSetTimeout(timeout_ms, link_local_timeout);
} }
@@ -138,7 +138,7 @@ static void link_local_timeout(void)
nprobes++; nprobes++;
debug_cond(DEBUG_LL_STATE, "probe/%u %s@%pI4\n", debug_cond(DEBUG_LL_STATE, "probe/%u %s@%pI4\n",
nprobes, eth_get_name(), &ip); nprobes, eth_get_name(), &ip);
arp_raw_request(zero_ip, net_null_ethaddr, ip); arp_raw_request(zero_ip, net_null_ethaddr, ip);
timeout_ms = PROBE_MIN * 1000; timeout_ms = PROBE_MIN * 1000;
timeout_ms += random_delay_ms(PROBE_MAX - PROBE_MIN); timeout_ms += random_delay_ms(PROBE_MAX - PROBE_MIN);
@@ -147,7 +147,7 @@ static void link_local_timeout(void)
state = ANNOUNCE; state = ANNOUNCE;
nclaims = 0; nclaims = 0;
debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n", debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
nclaims, eth_get_name(), &ip); nclaims, eth_get_name(), &ip);
arp_raw_request(ip, net_ethaddr, ip); arp_raw_request(ip, net_ethaddr, ip);
timeout_ms = ANNOUNCE_INTERVAL * 1000; timeout_ms = ANNOUNCE_INTERVAL * 1000;
} }
@@ -159,7 +159,7 @@ static void link_local_timeout(void)
state = ANNOUNCE; state = ANNOUNCE;
nclaims = 0; nclaims = 0;
debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n", debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
nclaims, eth_get_name(), &ip); nclaims, eth_get_name(), &ip);
arp_raw_request(ip, net_ethaddr, ip); arp_raw_request(ip, net_ethaddr, ip);
timeout_ms = ANNOUNCE_INTERVAL * 1000; timeout_ms = ANNOUNCE_INTERVAL * 1000;
break; break;
@@ -170,7 +170,7 @@ static void link_local_timeout(void)
if (nclaims < ANNOUNCE_NUM) { if (nclaims < ANNOUNCE_NUM) {
nclaims++; nclaims++;
debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n", debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
nclaims, eth_get_name(), &ip); nclaims, eth_get_name(), &ip);
arp_raw_request(ip, net_ethaddr, ip); arp_raw_request(ip, net_ethaddr, ip);
timeout_ms = ANNOUNCE_INTERVAL * 1000; timeout_ms = ANNOUNCE_INTERVAL * 1000;
} else { } else {
@@ -224,7 +224,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
/* Current time is greater than the expected timeout /* Current time is greater than the expected timeout
time. This should never happen */ time. This should never happen */
debug_cond(DEBUG_LL_STATE, debug_cond(DEBUG_LL_STATE,
"missed an expected timeout\n"); "missed an expected timeout\n");
timeout_ms = 0; timeout_ms = 0;
} else { } else {
debug_cond(DEBUG_INT_STATE, "adjusting timeout\n"); debug_cond(DEBUG_INT_STATE, "adjusting timeout\n");
@@ -239,9 +239,8 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
* FIXME: links routinely go down; * FIXME: links routinely go down;
*/ */
bb_error_msg("iface %s is down", eth_get_name()); bb_error_msg("iface %s is down", eth_get_name());
if (ready) { if (ready)
run(argv, "deconfig", &ip); run(argv, "deconfig", &ip);
}
return EXIT_FAILURE; return EXIT_FAILURE;
} }
continue; continue;
@@ -249,18 +248,17 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
#endif #endif
debug_cond(DEBUG_INT_STATE, "%s recv arp type=%d, op=%d,\n", debug_cond(DEBUG_INT_STATE, "%s recv arp type=%d, op=%d,\n",
eth_get_name(), ntohs(arp->ar_pro), eth_get_name(), ntohs(arp->ar_pro),
ntohs(arp->ar_op)); ntohs(arp->ar_op));
debug_cond(DEBUG_INT_STATE, "\tsource=%pM %pI4\n", debug_cond(DEBUG_INT_STATE, "\tsource=%pM %pI4\n",
&arp->ar_sha, &arp->ar_sha,
&arp->ar_spa); &arp->ar_spa);
debug_cond(DEBUG_INT_STATE, "\ttarget=%pM %pI4\n", debug_cond(DEBUG_INT_STATE, "\ttarget=%pM %pI4\n",
&arp->ar_tha, &arp->ar_tha,
&arp->ar_tpa); &arp->ar_tpa);
if (arp->ar_op != htons(ARPOP_REQUEST) if (arp->ar_op != htons(ARPOP_REQUEST) &&
&& arp->ar_op != htons(ARPOP_REPLY) arp->ar_op != htons(ARPOP_REPLY)) {
) {
configure_wait(); configure_wait();
return; return;
} }
@@ -287,8 +285,8 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
} }
debug_cond(DEBUG_NET_PKT, debug_cond(DEBUG_NET_PKT,
"state = %d, source ip conflict = %d, target ip conflict = " "state = %d, source ip conflict = %d, target ip conflict = "
"%d\n", state, source_ip_conflict, target_ip_conflict); "%d\n", state, source_ip_conflict, target_ip_conflict);
switch (state) { switch (state) {
case PROBE: case PROBE:
case ANNOUNCE: case ANNOUNCE: