From: Patrick McHardy <kaber@trash.net>
To: Wang Chen <wangchen@cn.fujitsu.com>
Cc: "David S. Miller" <davem@davemloft.net>, NETDEV <netdev@vger.kernel.org>
Subject: Re: [PATCH net-next 8/8] 8021q: Check return of dev_set_promiscuity/allmulti
Date: Fri, 20 Jun 2008 11:47:04 +0200 [thread overview]
Message-ID: <485B7C98.80302@trash.net> (raw)
In-Reply-To: <485B001F.1070407@cn.fujitsu.com>
Wang Chen wrote:
> diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
> index 5d055c2..1f2669b 100644
> --- a/net/8021q/vlan_dev.c
> +++ b/net/8021q/vlan_dev.c
> @@ -547,12 +547,23 @@ static int vlan_dev_open(struct net_device *dev)
> }
> memcpy(vlan->real_dev_addr, real_dev->dev_addr, ETH_ALEN);
>
> - if (dev->flags & IFF_ALLMULTI)
> - dev_set_allmulti(real_dev, 1);
> - if (dev->flags & IFF_PROMISC)
> - dev_set_promiscuity(real_dev, 1);
> + if (dev->flags & IFF_ALLMULTI) {
> + err = dev_set_allmulti(real_dev, 1);
> + if (err < 0)
> + goto out;
> + }
> + if (dev->flags & IFF_PROMISC) {
> + err = dev_set_promiscuity(real_dev, 1);
> + if (err < 0)
> + goto out;
> + }
>
> return 0;
> +
> +out:
> + if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
> + dev_unicast_delete(real_dev, dev->dev_addr, dev->addr_len);
> + return err;
This doesn't undo the operations that already succeeded.
next prev parent reply other threads:[~2008-06-20 9:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-20 0:55 [PATCH net-next 8/8] 8021q: Check return of dev_set_promiscuity/allmulti Wang Chen
2008-06-20 9:47 ` Patrick McHardy [this message]
2008-06-20 10:02 ` Wang Chen
2008-06-20 10:08 ` Patrick McHardy
2008-06-20 15:08 ` Wang Chen
2008-06-24 11:41 ` Patrick McHardy
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=485B7C98.80302@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=wangchen@cn.fujitsu.com \
/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).