From: Veaceslav Falico <vfalico@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: nikolay@redhat.com, netdev@vger.kernel.org, fubar@us.ibm.com,
andy@greyhouse.net, kaber@trash.net
Subject: Re: [net-next,1/3] bonding: fix vlan 0 addition and removal
Date: Tue, 6 Aug 2013 02:37:35 +0200 [thread overview]
Message-ID: <20130806003735.GA14443@redhat.com> (raw)
In-Reply-To: <20130805.160822.47868741818443064.davem@davemloft.net>
On Mon, Aug 05, 2013 at 04:08:22PM -0700, David Miller wrote:
>From: Veaceslav Falico <vfalico@redhat.com>
>Date: Mon, 5 Aug 2013 23:51:26 +0200
>
>> @@ -69,7 +69,6 @@
>> #include <net/arp.h>
>> #include <linux/mii.h>
>> #include <linux/ethtool.h>
>> -#include <linux/if_vlan.h>
>> #include <linux/if_bonding.h>
>> #include <linux/jiffies.h>
>> #include <linux/preempt.h>
>> @@ -1976,7 +1975,7 @@ static int __bond_release_one(struct net_device
>> *bond_dev,
>> bond_set_carrier(bond);
>> eth_hw_addr_random(bond_dev);
>> - if (bond_vlan_used(bond)) {
>> + if (vlan_uses_dev(bond_dev)) {
>
>If you're adding a use of vlan_uses_dev(), you should retain the
>if_vlan.h include, not remove it.
I've added the usage of vlan_uses_dev_rcu() to bonding.h, so bonding.h
already includes linux/if_vlan.h, and thus any other bonding file doesn't
need it, cause it always includes bonding.h.
Sorry, my bad, should have added it to the commit message.
next prev parent reply other threads:[~2013-08-06 0:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-05 13:28 [PATCH net-next 0/3] bonding: vlan handling changes Nikolay Aleksandrov
2013-08-05 13:28 ` [PATCH net-next 1/3] bonding: fix vlan 0 addition and removal Nikolay Aleksandrov
2013-08-05 21:51 ` [net-next,1/3] " Veaceslav Falico
2013-08-05 23:08 ` David Miller
2013-08-06 0:37 ` Veaceslav Falico [this message]
2013-08-06 8:16 ` Nikolay Aleksandrov
2013-08-06 8:51 ` Veaceslav Falico
2013-08-06 9:01 ` Nikolay Aleksandrov
2013-08-06 8:39 ` Nikolay Aleksandrov
2013-08-06 8:59 ` Veaceslav Falico
2013-08-06 9:07 ` Nikolay Aleksandrov
2013-08-06 9:10 ` Veaceslav Falico
2013-08-05 13:28 ` [PATCH net-next 2/3] bonding: change the bond's vlan syncing functions with the standard ones Nikolay Aleksandrov
2013-08-05 21:56 ` [net-next, " Veaceslav Falico
2013-08-05 13:28 ` [PATCH net-next 3/3] bonding: unwind on bond_add_vlan add failure Nikolay Aleksandrov
2013-08-05 21:59 ` [net-next,3/3] " Veaceslav Falico
2013-08-05 23:09 ` 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=20130806003735.GA14443@redhat.com \
--to=vfalico@redhat.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=fubar@us.ibm.com \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=nikolay@redhat.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).