]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
nfp: bpf: reorder arguments to emit_ld_field_any()
authorJakub Kicinski <jakub.kicinski@netronome.com>
Thu, 12 Oct 2017 17:34:08 +0000 (10:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Oct 2017 18:13:27 +0000 (11:13 -0700)
ld_field instruction has the following format in NFP assembler:

  ld_field[dst, 1000, src, <<24]

reoder parameters to emit_ld_field_any() to make it closer to
the familiar assembler order.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/bpf/jit.c

index 13148f30fc4c1877d0ad3084aa06dc2bbe5d59e3..cf8a6eb3ec9931d22f144cb42885a2eb09ff4d43 100644 (file)
@@ -402,8 +402,8 @@ __emit_ld_field(struct nfp_prog *nfp_prog, enum shf_sc sc,
 }
 
 static void
-emit_ld_field_any(struct nfp_prog *nfp_prog, enum shf_sc sc, u8 shift,
-                 swreg dst, u8 bmask, swreg src, bool zero)
+emit_ld_field_any(struct nfp_prog *nfp_prog, swreg dst, u8 bmask, swreg src,
+                 enum shf_sc sc, u8 shift, bool zero)
 {
        struct nfp_insn_re_regs reg;
        int err;
@@ -424,7 +424,7 @@ static void
 emit_ld_field(struct nfp_prog *nfp_prog, swreg dst, u8 bmask, swreg src,
              enum shf_sc sc, u8 shift)
 {
-       emit_ld_field_any(nfp_prog, sc, shift, dst, bmask, src, false);
+       emit_ld_field_any(nfp_prog, dst, bmask, src, sc, shift, false);
 }
 
 static void emit_nop(struct nfp_prog *nfp_prog)