Merge branch 'linux-5.7' of git://github.com/skeggsb/linux into drm-fixes

[linux-2.6-microblaze.git] / include / linux / netpoll.h

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 3ef82d3..676f1ff 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -31,8 +31,6 @@ struct netpoll {
        bool ipv6;
        u16 local_port, remote_port;
        u8 remote_mac[ETH_ALEN];
-
-       struct work_struct cleanup_work;
 };
 
 struct netpoll_info {
@@ -63,7 +61,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt);
 int __netpoll_setup(struct netpoll *np, struct net_device *ndev);
 int netpoll_setup(struct netpoll *np);
 void __netpoll_cleanup(struct netpoll *np);
-void __netpoll_free_async(struct netpoll *np);
+void __netpoll_free(struct netpoll *np);
 void netpoll_cleanup(struct netpoll *np);
 void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
                             struct net_device *dev);