Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[linux.git] / samples / bpf / sockex3_kern.c

diff --git a/samples/bpf/sockex3_kern.c b/samples/bpf/sockex3_kern.c
index 95907f8d2b17ddd95836692ea410ab50a83da565..c527b57d3ec8a5a9aa086d1f8981846173446556 100644 (file)
--- a/samples/bpf/sockex3_kern.c
+++ b/samples/bpf/sockex3_kern.c
@@ -61,7 +61,7 @@ struct vlan_hdr {
        __be16 h_vlan_encapsulated_proto;
 };
 
-struct bpf_flow_keys {
+struct flow_key_record {
        __be32 src;
        __be32 dst;
        union {
@@ -88,7 +88,7 @@ static inline __u32 ipv6_addr_hash(struct __sk_buff *ctx, __u64 off)
 }
 
 struct globals {
-       struct bpf_flow_keys flow;
+       struct flow_key_record flow;
 };
 
 struct bpf_map_def SEC("maps") percpu_map = {
@@ -114,14 +114,14 @@ struct pair {
 
 struct bpf_map_def SEC("maps") hash_map = {
        .type = BPF_MAP_TYPE_HASH,
-       .key_size = sizeof(struct bpf_flow_keys),
+       .key_size = sizeof(struct flow_key_record),
        .value_size = sizeof(struct pair),
        .max_entries = 1024,
 };
 
 static void update_stats(struct __sk_buff *skb, struct globals *g)
 {
-       struct bpf_flow_keys key = g->flow;
+       struct flow_key_record key = g->flow;
        struct pair *value;
 
        value = bpf_map_lookup_elem(&hash_map, &key);