| Message ID | 5944fa3d-ab98-176d-aac2-a1412590c174@t-online.de |
|---|---|
| State | Rejected, archived |
| Headers | show |
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; >
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;
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(-)