Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two cases of overlapping changes, nothing fancy.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/samples/bpf/xdp_redirect_user.c b/samples/bpf/xdp_redirect_user.c
index 39de06f3ec25..5440cd620607 100644
--- a/samples/bpf/xdp_redirect_user.c
+++ b/samples/bpf/xdp_redirect_user.c
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
         }
 
         memset(&info, 0, sizeof(info));
-        ret = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+        ret = bpf_obj_get_info_by_fd(dummy_prog_fd, &info, &info_len);
         if (ret) {
                 printf("can't get prog info - %s\n", strerror(errno));
                 return ret;