2 files changed, 12 insertions, 6 deletions

diff --git a/samples/sockmap/sockmap_kern.c b/samples/sockmap/sockmap_kern.c
index 6ff986f7059b..f9b38ef82dc2 100644
--- a/samples/sockmap/sockmap_kern.c
+++ b/samples/sockmap/sockmap_kern.c
@@ -82,8 +82,7 @@ int bpf_sockmap(struct bpf_sock_ops *skops)
                 if (lport == 10000) {
                         ret = 1;
                         err = bpf_sock_map_update(skops, &sock_map, &ret,
-                                                  BPF_NOEXIST,
-                                                  BPF_SOCKMAP_STRPARSER);
+                                                  BPF_NOEXIST);
                         bpf_printk("passive(%i -> %i) map ctx update err: %d\n",
                                    lport, bpf_ntohl(rport), err);
                 }
@@ -95,8 +94,7 @@ int bpf_sockmap(struct bpf_sock_ops *skops)
                 if (bpf_ntohl(rport) == 10001) {
                         ret = 10;
                         err = bpf_sock_map_update(skops, &sock_map, &ret,
-                                                  BPF_NOEXIST,
-                                                  BPF_SOCKMAP_STRPARSER);
+                                                  BPF_NOEXIST);
                         bpf_printk("active(%i -> %i) map ctx update err: %d\n",
                                    lport, bpf_ntohl(rport), err);
                 }
diff --git a/samples/sockmap/sockmap_user.c b/samples/sockmap/sockmap_user.c
index fb78f5abefb4..7cc9d228216f 100644
--- a/samples/sockmap/sockmap_user.c
+++ b/samples/sockmap/sockmap_user.c
@@ -256,8 +256,16 @@ int main(int argc, char **argv)
         }
 
         /* Attach programs to sockmap */
-        err = __bpf_prog_attach(prog_fd[0], prog_fd[1], map_fd[0],
-                                BPF_CGROUP_SMAP_INGRESS, 0);
+        err = bpf_prog_attach(prog_fd[0], map_fd[0],
+                                BPF_SK_SKB_STREAM_PARSER, 0);
+        if (err) {
+                fprintf(stderr, "ERROR: bpf_prog_attach (sockmap): %d (%s)\n",
+                        err, strerror(errno));
+                return err;
+        }
+
+        err = bpf_prog_attach(prog_fd[1], map_fd[0],
+                                BPF_SK_SKB_STREAM_VERDICT, 0);
         if (err) {
                 fprintf(stderr, "ERROR: bpf_prog_attach (sockmap): %d (%s)\n",
                         err, strerror(errno));