| Message ID | 1287573408-6494-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted |
| Commit | 2e3ef6e4e475ecd0f4dfe3888b98aa077ef790fe |
| Delegated to: | Wolfgang Denk |
| Headers | show |
Dear Mike Frysinger, In message <1287573408-6494-1-git-send-email-vapier@gentoo.org> you wrote: > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > include/net.h | 2 +- > net/net.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to "next" branch, thanks. Best regards, Wolfgang Denk
diff --git a/include/net.h b/include/net.h index dd673f0..5e3495b 100644 --- a/include/net.h +++ b/include/net.h @@ -520,7 +520,7 @@ extern IPaddr_t string_to_ip(char *s); extern void VLAN_to_string (ushort x, char *s); /* Convert a string to a vlan id */ -extern ushort string_to_VLAN(char *s); +extern ushort string_to_VLAN(const char *s); /* read a VLAN id from an environment variable */ extern ushort getenv_VLAN(char *); diff --git a/net/net.c b/net/net.c index 7576419..a609632 100644 --- a/net/net.c +++ b/net/net.c @@ -1913,7 +1913,7 @@ void VLAN_to_string(ushort x, char *s) sprintf(s, "%d", x & VLAN_IDMASK); } -ushort string_to_VLAN(char *s) +ushort string_to_VLAN(const char *s) { ushort id;
Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- include/net.h | 2 +- net/net.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)