Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
map-controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Multi-AP
map-controller
Commits
a80cdf75
Commit
a80cdf75
authored
5 months ago
by
Anjan Chanda
Browse files
Options
Downloads
Patches
Plain Diff
utils.h: fix warns - rename conflicting wifi_band_to_str()
parent
1b7df590
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/config.c
+1
-1
1 addition, 1 deletion
src/config.c
src/utils/utils.c
+1
-1
1 addition, 1 deletion
src/utils/utils.c
src/utils/utils.h
+1
-1
1 addition, 1 deletion
src/utils/utils.h
with
3 additions
and
3 deletions
src/config.c
+
1
−
1
View file @
a80cdf75
...
...
@@ -585,7 +585,7 @@ int cntlr_config_add_node_radio(struct controller_config *c, uint8_t *alid,
if
(
ret
)
goto
out_pkg
;
ret
=
set_value
(
ctx
,
pkg
,
section
,
"band"
,
wifi_band_to_str
(
band
),
UCI_TYPE_STRING
);
ret
=
set_value
(
ctx
,
pkg
,
section
,
"band"
,
wifi_
freq
band_to_str
(
band
),
UCI_TYPE_STRING
);
if
(
ret
)
goto
out_pkg
;
...
...
...
...
This diff is collapsed.
Click to expand it.
src/utils/utils.c
+
1
−
1
View file @
a80cdf75
...
...
@@ -579,7 +579,7 @@ uint16_t wifi_sec_to_auth_types(enum wifi_security sec)
return
auth_type
;
}
const
char
*
wifi_band_to_str
(
uint32_t
band
)
const
char
*
wifi_
freq
band_to_str
(
uint32_t
band
)
{
if
(
band
==
BAND_2
)
return
"2"
;
...
...
...
...
This diff is collapsed.
Click to expand it.
src/utils/utils.h
+
1
−
1
View file @
a80cdf75
...
...
@@ -159,7 +159,7 @@ int rcpi_to_rssi(uint8_t rcpi);
bool
is_vid_valid
(
uint16_t
vid
);
uint16_t
wifi_sec_to_auth_types
(
enum
wifi_security
sec
);
const
char
*
wifi_band_to_str
(
uint32_t
band
);
const
char
*
wifi_
freq
band_to_str
(
uint32_t
band
);
int
time_str_to_sec
(
const
char
*
val
);
#define blobmsg_add_macaddr(b, f, v) \
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment