diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-20 02:45:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-20 02:45:16 +0300 |
| commit | 9492f4269e6bf3c857412b464ce77bd84e7a81f9 (patch) | |
| tree | 3736927f2f621ae83d4830280ac3a3ab93274c06 /include | |
| parent | eb2b98742641ae544fd16311055789ab7cac62aa (diff) | |
| parent | 7051b88a35c7dde5705923833117e14f9cc17d92 (diff) | |
| download | linux-9492f4269e6bf3c857412b464ce77bd84e7a81f9.tar.xz | |
Merge branch 'dev_close-void'
Stephen Hemminger says:
====================
net: make dev_close void
Noticed while working on other changes. Why is dev_close()
returning int, it should be void. Should also change
ndo_close to be void, but that requires more work and someone
with more coccinelle foo (smpl) than me.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c60351b84323..614642eb7eb7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2432,8 +2432,8 @@ struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); struct net_device *__dev_get_by_name(struct net *net, const char *name); int dev_alloc_name(struct net_device *dev, const char *name); int dev_open(struct net_device *dev); -int dev_close(struct net_device *dev); -int dev_close_many(struct list_head *head, bool unlink); +void dev_close(struct net_device *dev); +void dev_close_many(struct list_head *head, bool unlink); void dev_disable_lro(struct net_device *dev); int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb); int dev_queue_xmit(struct sk_buff *skb); |