1 files changed, 3 insertions, 4 deletions

diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 5007b5d4fd2c..e02025bbe36d 100644
--- a/tools/lib/bpf/xsk.c
+++ b/tools/lib/bpf/xsk.c
@@ -317,15 +317,14 @@ static int xsk_load_xdp_prog(struct xsk_socket *xsk)
 
 static int xsk_get_max_queues(struct xsk_socket *xsk)
 {
-        struct ethtool_channels channels;
-        struct ifreq ifr;
+        struct ethtool_channels channels = { .cmd = ETHTOOL_GCHANNELS };
+        struct ifreq ifr = {};
         int fd, err, ret;
 
         fd = socket(AF_INET, SOCK_DGRAM, 0);
         if (fd < 0)
                 return -errno;
 
-        channels.cmd = ETHTOOL_GCHANNELS;
         ifr.ifr_data = (void *)&channels;
         strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1);
         ifr.ifr_name[IFNAMSIZ - 1] = '\0';
@@ -335,7 +334,7 @@ static int xsk_get_max_queues(struct xsk_socket *xsk)
                 goto out;
         }
 
-        if (channels.max_combined == 0 || errno == EOPNOTSUPP)
+        if (err || channels.max_combined == 0)
                 /* If the device says it has no channels, then all traffic
                  * is sent to a single stream, so max queues = 1.
                  */