aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-15 21:57:30 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-15 21:57:30 -0400
commita498cfe990f569dd3766bfc9bfd2a5ee04468cd2 (patch)
treeef0c4dc4642696d84bd56c4f409dd32507981bb0 /net
parent12028820423bd7705beb5e09889faab95c545ea1 (diff)
parentc04167ce2ca0ecaeaafef006cb0d65cf01b68e42 (diff)
Merge branch 'ebpf_helpers'
Daniel Borkmann says: ==================== eBPF updates Two small eBPF helper additions to better match up with ancillary classic BPF functionality. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/filter.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 7a4eb7030dba..33310eee6134 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1139,6 +1139,10 @@ sk_filter_func_proto(enum bpf_func_id func_id)
1139 return &bpf_map_update_elem_proto; 1139 return &bpf_map_update_elem_proto;
1140 case BPF_FUNC_map_delete_elem: 1140 case BPF_FUNC_map_delete_elem:
1141 return &bpf_map_delete_elem_proto; 1141 return &bpf_map_delete_elem_proto;
1142 case BPF_FUNC_get_prandom_u32:
1143 return &bpf_get_prandom_u32_proto;
1144 case BPF_FUNC_get_smp_processor_id:
1145 return &bpf_get_smp_processor_id_proto;
1142 default: 1146 default:
1143 return NULL; 1147 return NULL;
1144 } 1148 }