1 files changed, 9 insertions, 6 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index df7637733e3c..a91572aa73d5 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6934,8 +6934,7 @@ int dev_change_proto_down(struct net_device *dev, bool proto_down)
 }
 EXPORT_SYMBOL(dev_change_proto_down);
 
-bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op,
-                        u32 *prog_id)
+u8 __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op, u32 *prog_id)
 {
         struct netdev_xdp xdp;
 
@@ -6951,14 +6950,18 @@ bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op,
 }
 
 static int dev_xdp_install(struct net_device *dev, xdp_op_t xdp_op,
-                           struct netlink_ext_ack *extack,
+                           struct netlink_ext_ack *extack, u32 flags,
                            struct bpf_prog *prog)
 {
         struct netdev_xdp xdp;
 
         memset(&xdp, 0, sizeof(xdp));
-        xdp.command = XDP_SETUP_PROG;
+        if (flags & XDP_FLAGS_HW_MODE)
+                xdp.command = XDP_SETUP_PROG_HW;
+        else
+                xdp.command = XDP_SETUP_PROG;
         xdp.extack = extack;
+        xdp.flags = flags;
         xdp.prog = prog;
 
         return xdp_op(dev, &xdp);
@@ -6984,7 +6987,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
         ASSERT_RTNL();
 
         xdp_op = xdp_chk = ops->ndo_xdp;
-        if (!xdp_op && (flags & XDP_FLAGS_DRV_MODE))
+        if (!xdp_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE)))
                 return -EOPNOTSUPP;
         if (!xdp_op || (flags & XDP_FLAGS_SKB_MODE))
                 xdp_op = generic_xdp_install;
@@ -7003,7 +7006,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
                         return PTR_ERR(prog);
         }
 
-        err = dev_xdp_install(dev, xdp_op, extack, prog);
+        err = dev_xdp_install(dev, xdp_op, extack, flags, prog);
         if (err < 0 && prog)
                 bpf_prog_put(prog);