Merge ath-next from ath.git.

[firefly-linux-kernel-4.4.55.git] / arch / um / drivers / net_user.c

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index cd14157b556d178d14998a5e024a15629c3491ad..e697a4136707e13c609a5e51529f87631896b0c6 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -166,7 +166,7 @@ int net_sendto(int fd, void *buf, int len, void *to, int sock_len)
 
 struct change_pre_exec_data {
        int close_me;
-       int stdout;
+       int stdout_fd;
 };
 
 static void change_pre_exec(void *arg)
@@ -174,7 +174,7 @@ static void change_pre_exec(void *arg)
        struct change_pre_exec_data *data = arg;
 
        close(data->close_me);
-       dup2(data->stdout, 1);
+       dup2(data->stdout_fd, 1);
 }
 
 static int change_tramp(char **argv, char *output, int output_len)
@@ -189,7 +189,7 @@ static int change_tramp(char **argv, char *output, int output_len)
                return err;
        }
        pe_data.close_me = fds[0];
-       pe_data.stdout = fds[1];
+       pe_data.stdout_fd = fds[1];
        pid = run_helper(change_pre_exec, &pe_data, argv);
 
        if (pid > 0)    /* Avoid hang as we won't get data in failure case. */