* [B.A.T.M.A.N.] [PATCH v2] Alfred not working within network name space
@ 2016-11-06 7:29 Jean-Jacques Sarton
2016-11-06 8:10 ` Sven Eckelmann
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Jacques Sarton @ 2016-11-06 7:29 UTC (permalink / raw)
To: b.a.t.m.a.n, Jean-Jacques Sarton
[-- Attachment #1.1: Type: text/plain, Size: 612 bytes --]
scope of function corrected, has to be static
Signed-off-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
---
batadv_query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/batadv_query.c b/batadv_query.c
index dc8a042..69f5a48 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -136,7 +136,7 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac)
return 0;
}
-int batadv_interface_check_debugfs(const char *mesh_iface)
+static int batadv_interface_check_debugfs(const char *mesh_iface)
{
char full_path[MAX_PATH + 1];
FILE *f;
--
2.7.4
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 213 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH v2] Alfred not working within network name space
2016-11-06 7:29 [B.A.T.M.A.N.] [PATCH v2] Alfred not working within network name space Jean-Jacques Sarton
@ 2016-11-06 8:10 ` Sven Eckelmann
0 siblings, 0 replies; 2+ messages in thread
From: Sven Eckelmann @ 2016-11-06 8:10 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 1482 bytes --]
On Sonntag, 6. November 2016 08:29:27 CET Jean-Jacques Sarton wrote:
> scope of function corrected, has to be static
>
> Signed-off-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
> ---
> batadv_query.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
subject is wrong, commit message body is wrong, patch doesn't apply.
Applying patch #16803 using 'git am'
Description: [v2] Alfred not working within network name space
Applying: Alfred not working within network name space
error: patch failed: batadv_query.c:136
error: batadv_query.c: patch does not apply
Patch failed at 0001 Alfred not working within network name space
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128
I would guess that you wanted to squash it in the previous patch.
>
> diff --git a/batadv_query.c b/batadv_query.c
> index dc8a042..69f5a48 100644
> --- a/batadv_query.c
> +++ b/batadv_query.c
> @@ -136,7 +136,7 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac)
> return 0;
> }
>
> -int batadv_interface_check_debugfs(const char *mesh_iface)
> +static int batadv_interface_check_debugfs(const char *mesh_iface)
> {
> char full_path[MAX_PATH + 1];
> FILE *f;
>
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-06 8:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-06 7:29 [B.A.T.M.A.N.] [PATCH v2] Alfred not working within network name space Jean-Jacques Sarton
2016-11-06 8:10 ` Sven Eckelmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).