diff options
author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2015-01-15 04:21:58 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-01-15 05:10:37 -0500 |
commit | 1a92b2deaf5c1b71f995ef571076200a391aac66 (patch) | |
tree | ef373976b1252dba6f1f6cdd99cd9bbeecbe9370 /arch/s390 | |
parent | d86eb7448e6de97b1319ea935f77b65590dbc049 (diff) |
s390/bpf: Fix sk_load_byte_msh()
In sk_load_byte_msh() sk_load_byte_slow() is called instead of
sk_load_byte_msh_slow(). Fix this and call the correct function.
Besides of this load only one byte instead of two and fix the comment.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/net/bpf_jit.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/net/bpf_jit.S b/arch/s390/net/bpf_jit.S index ede6108c0002..e2f2111bd107 100644 --- a/arch/s390/net/bpf_jit.S +++ b/arch/s390/net/bpf_jit.S | |||
@@ -106,11 +106,11 @@ sk_load_byte_slow: | |||
106 | lgr %r2,%r9 # restore %r2 | 106 | lgr %r2,%r9 # restore %r2 |
107 | br %r8 | 107 | br %r8 |
108 | 108 | ||
109 | /* A = (*(u8 *)(skb->data+K) & 0xf) << 2 */ | 109 | /* X = (*(u8 *)(skb->data+K) & 0xf) << 2 */ |
110 | ENTRY(sk_load_byte_msh) | 110 | ENTRY(sk_load_byte_msh) |
111 | llgfr %r1,%r3 # extend offset | 111 | llgfr %r1,%r3 # extend offset |
112 | clr %r11,%r3 # hlen < offset ? | 112 | clr %r11,%r3 # hlen < offset ? |
113 | jle sk_load_byte_slow | 113 | jle sk_load_byte_msh_slow |
114 | lhi %r12,0 | 114 | lhi %r12,0 |
115 | ic %r12,0(%r1,%r10) # get byte from skb | 115 | ic %r12,0(%r1,%r10) # get byte from skb |
116 | nill %r12,0x0f | 116 | nill %r12,0x0f |
@@ -120,8 +120,8 @@ ENTRY(sk_load_byte_msh) | |||
120 | 120 | ||
121 | sk_load_byte_msh_slow: | 121 | sk_load_byte_msh_slow: |
122 | lgr %r9,%r2 # save %r2 | 122 | lgr %r9,%r2 # save %r2 |
123 | la %r4,162(%r15) # pointer to temp buffer | 123 | la %r4,163(%r15) # pointer to temp buffer |
124 | lhi %r5,2 # 2 bytes | 124 | lhi %r5,1 # 1 bytes |
125 | brasl %r14,skb_copy_bits # get data from skb | 125 | brasl %r14,skb_copy_bits # get data from skb |
126 | xc 160(3,%r15),160(%r15) | 126 | xc 160(3,%r15),160(%r15) |
127 | l %r12,160(%r15) # load result from temp buffer | 127 | l %r12,160(%r15) # load result from temp buffer |