From: "Toralf Förster" <toralf.foerster@gmx.de>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>,
netdev@vger.kernel.org,
Linux Kernel <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>
Subject: Re: [PATCHv2] tun: fix carrier on/off status
Date: Mon, 28 Jan 2013 20:38:38 +0100 [thread overview]
Message-ID: <5106D3BE.3030401@gmx.de> (raw)
In-Reply-To: <20130128103801.GA6648@redhat.com>
Tested-by: Toralf Förster <toralf.foerster@gmx.de>
On 01/28/2013 11:38 AM, Michael S. Tsirkin wrote:
> Commit c8d68e6be1c3b242f1c598595830890b65cea64a removed carrier off call
> from tun_detach since it's now called on queue disable and not only on
> tun close. This confuses userspace which used this flag to detect a
> free tun. To fix, put this back but under if (clean).
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ---
>
> Changes from v1:
> Don't set carrier off unless all queues are closed.
>
> Note: didn't test in MQ mode - Jason, care checking this does the
> right thing there?
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index af372d0..06b2723 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -434,10 +434,13 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
> }
>
> if (clean) {
> - if (tun && tun->numqueues == 0 && tun->numdisabled == 0 &&
> - !(tun->flags & TUN_PERSIST))
> - if (tun->dev->reg_state == NETREG_REGISTERED)
> + if (tun && tun->numqueues == 0 && tun->numdisabled == 0) {
> + netif_carrier_off(tun->dev);
> +
> + if (!(tun->flags & TUN_PERSIST) &&
> + tun->dev->reg_state == NETREG_REGISTERED)
> unregister_netdevice(tun->dev);
> + }
>
> BUG_ON(!test_bit(SOCK_EXTERNALLY_ALLOCATED,
> &tfile->socket.flags));
> @@ -1644,10 +1647,10 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
> device_create_file(&tun->dev->dev, &dev_attr_owner) ||
> device_create_file(&tun->dev->dev, &dev_attr_group))
> pr_err("Failed to create tun sysfs files\n");
> -
> - netif_carrier_on(tun->dev);
> }
>
> + netif_carrier_on(tun->dev);
> +
> tun_debug(KERN_INFO, tun, "tun_set_iff\n");
>
> if (ifr->ifr_flags & IFF_NO_PI)
>
--
MfG/Sincerely
Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3
next prev parent reply other threads:[~2013-01-28 19:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-26 10:29 How to find an unused TAP device with kernel 3.8 ? Toralf Förster
2013-01-28 9:38 ` Jason Wang
2013-01-28 10:11 ` [PATCH] tun: fix carrier on/off status Michael S. Tsirkin
2013-01-28 10:38 ` [PATCHv2] " Michael S. Tsirkin
2013-01-28 11:00 ` Jason Wang
2013-01-28 19:38 ` Toralf Förster [this message]
2013-01-29 20:45 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5106D3BE.3030401@gmx.de \
--to=toralf.foerster@gmx.de \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).