diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-19 12:10:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-19 12:10:49 +0100 |
| commit | 01438749e36bfe53ea25c91568019be775a9782e (patch) | |
| tree | f91f5abae2004863afda683589d034dcd2000ab8 /include/linux/netdevice.h | |
| parent | 4faf62b1ef1a9367f7dcf8b7ce509980dfdcee83 (diff) | |
| parent | bee645788e07eea63055d261d2884ea45c2ba857 (diff) | |
| download | cachepc-linux-01438749e36bfe53ea25c91568019be775a9782e.tar.gz cachepc-linux-01438749e36bfe53ea25c91568019be775a9782e.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent commits
We are applying further, lower-prio fixes on top of two ww_mutex fixes in locking/urgent.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f06fbee8638e..5b67ea89d5f2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3959,8 +3959,6 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode); -int xdp_umem_query(struct net_device *dev, u16 queue_id); - int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb); |