diff options
-rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/offload.c | 2 | ||||
-rw-r--r-- | include/linux/bpf.h | 4 | ||||
-rw-r--r-- | kernel/bpf/offload.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c index 320b2250d29a..6590228d3755 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c | |||
@@ -237,7 +237,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog, | |||
237 | int err; | 237 | int err; |
238 | 238 | ||
239 | if (prog) { | 239 | if (prog) { |
240 | struct bpf_dev_offload *offload = prog->aux->offload; | 240 | struct bpf_prog_offload *offload = prog->aux->offload; |
241 | 241 | ||
242 | if (!offload) | 242 | if (!offload) |
243 | return -EINVAL; | 243 | return -EINVAL; |
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c60ddfb34d41..9fff1ace1d8e 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h | |||
@@ -200,7 +200,7 @@ struct bpf_prog_offload_ops { | |||
200 | int insn_idx, int prev_insn_idx); | 200 | int insn_idx, int prev_insn_idx); |
201 | }; | 201 | }; |
202 | 202 | ||
203 | struct bpf_dev_offload { | 203 | struct bpf_prog_offload { |
204 | struct bpf_prog *prog; | 204 | struct bpf_prog *prog; |
205 | struct net_device *netdev; | 205 | struct net_device *netdev; |
206 | void *dev_priv; | 206 | void *dev_priv; |
@@ -230,7 +230,7 @@ struct bpf_prog_aux { | |||
230 | #ifdef CONFIG_SECURITY | 230 | #ifdef CONFIG_SECURITY |
231 | void *security; | 231 | void *security; |
232 | #endif | 232 | #endif |
233 | struct bpf_dev_offload *offload; | 233 | struct bpf_prog_offload *offload; |
234 | union { | 234 | union { |
235 | struct work_struct work; | 235 | struct work_struct work; |
236 | struct rcu_head rcu; | 236 | struct rcu_head rcu; |
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 040d4e0edf3f..001ddfde7874 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c | |||
@@ -32,7 +32,7 @@ static LIST_HEAD(bpf_prog_offload_devs); | |||
32 | 32 | ||
33 | int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) | 33 | int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) |
34 | { | 34 | { |
35 | struct bpf_dev_offload *offload; | 35 | struct bpf_prog_offload *offload; |
36 | 36 | ||
37 | if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS && | 37 | if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS && |
38 | attr->prog_type != BPF_PROG_TYPE_XDP) | 38 | attr->prog_type != BPF_PROG_TYPE_XDP) |
@@ -72,7 +72,7 @@ err_free: | |||
72 | static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd, | 72 | static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd, |
73 | struct netdev_bpf *data) | 73 | struct netdev_bpf *data) |
74 | { | 74 | { |
75 | struct bpf_dev_offload *offload = prog->aux->offload; | 75 | struct bpf_prog_offload *offload = prog->aux->offload; |
76 | struct net_device *netdev; | 76 | struct net_device *netdev; |
77 | 77 | ||
78 | ASSERT_RTNL(); | 78 | ASSERT_RTNL(); |
@@ -110,7 +110,7 @@ exit_unlock: | |||
110 | int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, | 110 | int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, |
111 | int insn_idx, int prev_insn_idx) | 111 | int insn_idx, int prev_insn_idx) |
112 | { | 112 | { |
113 | struct bpf_dev_offload *offload; | 113 | struct bpf_prog_offload *offload; |
114 | int ret = -ENODEV; | 114 | int ret = -ENODEV; |
115 | 115 | ||
116 | down_read(&bpf_devs_lock); | 116 | down_read(&bpf_devs_lock); |
@@ -124,7 +124,7 @@ int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, | |||
124 | 124 | ||
125 | static void __bpf_prog_offload_destroy(struct bpf_prog *prog) | 125 | static void __bpf_prog_offload_destroy(struct bpf_prog *prog) |
126 | { | 126 | { |
127 | struct bpf_dev_offload *offload = prog->aux->offload; | 127 | struct bpf_prog_offload *offload = prog->aux->offload; |
128 | struct netdev_bpf data = {}; | 128 | struct netdev_bpf data = {}; |
129 | 129 | ||
130 | data.offload.prog = prog; | 130 | data.offload.prog = prog; |
@@ -242,7 +242,7 @@ static int bpf_offload_notification(struct notifier_block *notifier, | |||
242 | ulong event, void *ptr) | 242 | ulong event, void *ptr) |
243 | { | 243 | { |
244 | struct net_device *netdev = netdev_notifier_info_to_dev(ptr); | 244 | struct net_device *netdev = netdev_notifier_info_to_dev(ptr); |
245 | struct bpf_dev_offload *offload, *tmp; | 245 | struct bpf_prog_offload *offload, *tmp; |
246 | 246 | ||
247 | ASSERT_RTNL(); | 247 | ASSERT_RTNL(); |
248 | 248 | ||