diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-30 19:52:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-30 19:52:37 -0700 |
| commit | ed52f2c608c9451fa2bad298b2ab927416105d65 (patch) | |
| tree | d624be01447b5d578aa79b02b37f0023a867bb42 /include/linux/netdevice.h | |
| parent | hv_netvsc: Remove unnecessary round_up for recv_completion_cnt (diff) | |
| parent | Merge branch 'cgroup-bpf_link' (diff) | |
| download | wireguard-linux-ed52f2c608c9451fa2bad298b2ab927416105d65.tar.xz wireguard-linux-ed52f2c608c9451fa2bad298b2ab927416105d65.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b521500b244d..130a668049ab 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3777,7 +3777,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf); int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, - int fd, u32 flags); + int fd, int expected_fd, u32 flags); u32 __dev_xdp_query(struct net_device *dev, bpf_op_t xdp_op, enum bpf_netdev_command cmd); int xdp_umem_query(struct net_device *dev, u16 queue_id); |