net: Rename skb->rxhash to skb->hash

The packet hash can be considered a property of the packet, not just
on RX path.

This patch changes name of rxhash and l4_rxhash skbuff fields to be
hash and l4_hash respectively. This includes changing uses of the
field in the code which don't call the access functions.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 13 insertions, 13 deletions

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 271b5e971568..7ddb9c83cdfc 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -825,8 +825,8 @@ b_epilogue:
                         break;
                 case BPF_S_ANC_RXHASH:
                         ctx->seen |= SEEN_SKB;
-                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, rxhash) != 4);
-                        off = offsetof(struct sk_buff, rxhash);
+                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
+                        off = offsetof(struct sk_buff, hash);
                         emit(ARM_LDR_I(r_A, r_skb, off), ctx);
                         break;
                 case BPF_S_ANC_VLAN_TAG:
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 555034f8505e..4afad6c17d50 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -390,9 +390,9 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,
                                                           mark));
                         break;
                 case BPF_S_ANC_RXHASH:
-                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, rxhash) != 4);
+                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
                         PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
-                                                          rxhash));
+                                                          hash));
                         break;
                 case BPF_S_ANC_VLAN_TAG:
                 case BPF_S_ANC_VLAN_TAG_PRESENT:
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 708d60e40066..153f8f2cfd56 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -737,10 +737,10 @@ call_fn:	/* lg %r1,<d(function)>(%r13) */
                 /* icm  %r5,3,<d(type)>(%r1) */
                 EMIT4_DISP(0xbf531000, offsetof(struct net_device, type));
                 break;
-        case BPF_S_ANC_RXHASH: /* A = skb->rxhash */
-                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, rxhash) != 4);
-                /* l %r5,<d(rxhash)>(%r2) */
-                EMIT4_DISP(0x58502000, offsetof(struct sk_buff, rxhash));
+        case BPF_S_ANC_RXHASH: /* A = skb->hash */
+                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
+                /* l %r5,<d(hash)>(%r2) */
+                EMIT4_DISP(0x58502000, offsetof(struct sk_buff, hash));
                 break;
         case BPF_S_ANC_VLAN_TAG:
         case BPF_S_ANC_VLAN_TAG_PRESENT:
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 01fe9946d388..d96d2a7c78ee 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -618,7 +618,7 @@ void bpf_jit_compile(struct sk_filter *fp)
                                 emit_load16(r_A, struct net_device, type, r_A);
                                 break;
                         case BPF_S_ANC_RXHASH:
-                                emit_skb_load32(rxhash, r_A);
+                                emit_skb_load32(hash, r_A);
                                 break;
                         case BPF_S_ANC_VLAN_TAG:
                         case BPF_S_ANC_VLAN_TAG_PRESENT:
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 4ed75dd81d05..293c57b74edc 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -553,13 +553,13 @@ void bpf_jit_compile(struct sk_filter *fp)
                                 }
                                 break;
                         case BPF_S_ANC_RXHASH:
-                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, rxhash) != 4);
-                                if (is_imm8(offsetof(struct sk_buff, rxhash))) {
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
+                                if (is_imm8(offsetof(struct sk_buff, hash))) {
                                         /* mov off8(%rdi),%eax */
-                                        EMIT3(0x8b, 0x47, offsetof(struct sk_buff, rxhash));
+                                        EMIT3(0x8b, 0x47, offsetof(struct sk_buff, hash));
                                 } else {
                                         EMIT2(0x8b, 0x87);
-                                        EMIT(offsetof(struct sk_buff, rxhash), 4);
+                                        EMIT(offsetof(struct sk_buff, hash), 4);
                                 }
                                 break;
                         case BPF_S_ANC_QUEUE: