diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
| commit | 25a9a924c0c8723ced99179eb639e8c5372a2557 (patch) | |
| tree | 83170168d50b9703486327b5b3a0bfb1d8da9b2b /drivers/net/macvtap.c | |
| parent | 0b101e62afe626ecae60173f92f1e0ec72151653 (diff) | |
| parent | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (diff) | |
| download | talos-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.tar.gz talos-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/macvtap.c')
| -rw-r--r-- | drivers/net/macvtap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index edd77342773a..248478c6f6e4 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -1111,10 +1111,10 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd, return 0; case TUNSETSNDBUF: - if (get_user(u, up)) + if (get_user(s, sp)) return -EFAULT; - q->sk.sk_sndbuf = u; + q->sk.sk_sndbuf = s; return 0; case TUNGETVNETHDRSZ: |
