From: Or Gerlitz <ogerlitz@Voltaire•com>
To: Jay Vosburgh <fubar@us•ibm.com>
Cc: David Miller <davem@davemloft•net>, netdev@vger•kernel.org
Subject: Re: zero features for a vlan over bond / vlan features
Date: Mon, 08 Jun 2009 12:34:14 +0300 [thread overview]
Message-ID: <4A2CDB16.9030000@Voltaire.com> (raw)
In-Reply-To: <24949.1240530461@death.nxdomain.ibm.com>
Jay Vosburgh wrote:
>>> The features system now has a dev->vlan_features that lists the
>>> features that will work through a vlan; bond_compute_features isn't
>>> using netdev_increment/fix_features to additionally compute the vlan_features, so
>>> that's ending up always empty even if the underlying device supports vlan passthrough
> Ok, here's a patch, but I'm not sure it's the right patch.
> I'm not entirely sure if the vlan_features should be amassed as
> the regular features are, or if it should be a strict subset
> (slave0->vlan_features & slave1->vlan_features, etc). This patch does the
> former, collecting the vlan_features in a manner analogous to the regular features.
Jay,
I have tested with your patch and indeed now, vlan-over-bond (e.g bond0.4001) advertises features to the stack wheres before it didn't. Below is the patch you sent with the debugging prints removed and my signature added, I would be happy if you set the change-log && your signature and push it further to Dave. I'm also find if you prefer that I'll do that.
Signed-off-by: Or Gerlitz <ogerlitz@voltaire•com>
Index: net-next-2.6/drivers/net/bonding/bond_main.c
===================================================================
--- net-next-2.6.orig/drivers/net/bonding/bond_main.c
+++ net-next-2.6/drivers/net/bonding/bond_main.c
@@ -1339,6 +1339,7 @@ static int bond_compute_features(struct
struct slave *slave;
struct net_device *bond_dev = bond->dev;
unsigned long features = bond_dev->features;
+ unsigned long vlan_features = 0;
unsigned short max_hard_header_len = max((u16)ETH_HLEN,
bond_dev->hard_header_len);
int i;
@@ -1351,10 +1352,14 @@ static int bond_compute_features(struct
features &= ~NETIF_F_ONE_FOR_ALL;
+ vlan_features = bond->first_slave->dev->vlan_features;
bond_for_each_slave(bond, slave, i) {
features = netdev_increment_features(features,
slave->dev->features,
NETIF_F_ONE_FOR_ALL);
+ vlan_features = netdev_increment_features(vlan_features,
+ slave->dev->vlan_features,
+ NETIF_F_ONE_FOR_ALL);
if (slave->dev->hard_header_len > max_hard_header_len)
max_hard_header_len = slave->dev->hard_header_len;
}
@@ -1362,6 +1367,7 @@ static int bond_compute_features(struct
done:
features |= (bond_dev->features & BOND_VLAN_FEATURES);
bond_dev->features = netdev_fix_features(features, NULL);
+ bond_dev->vlan_features = netdev_fix_features(vlan_features, NULL);
bond_dev->hard_header_len = max_hard_header_len;
return 0;
next prev parent reply other threads:[~2009-06-08 9:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 13:00 zero features for a vlan over bond Or Gerlitz
2009-04-07 14:16 ` Jay Vosburgh
2009-04-07 22:16 ` Or Gerlitz
2009-04-16 14:11 ` zero features for a vlan over bond / vlan features Or Gerlitz
2009-04-23 23:47 ` Jay Vosburgh
2009-06-08 9:34 ` Or Gerlitz [this message]
2009-07-20 8:08 ` Or Gerlitz
2009-07-22 21:34 ` [PATCH net-next-2.6] bonding: propogate vlan_features to bonding master Jay Vosburgh
2009-07-23 6:03 ` Eric Dumazet
2009-07-23 7:24 ` Or Gerlitz
2009-07-23 8:29 ` [PATCH net-next-2.6] bnx2: Update vlan_features Eric Dumazet
2009-07-23 12:01 ` Eric Dumazet
2009-07-23 17:59 ` David Miller
2009-07-24 0:12 ` Michael Chan
2009-07-24 7:21 ` [PATCH net-next-2.6] bnx2x: Dont update vlan_features in bnx2x_set_tso() Eric Dumazet
2009-07-26 10:53 ` Eilon Greenstein
2009-07-27 2:49 ` David Miller
2009-07-27 2:50 ` [PATCH net-next-2.6] bnx2: Update vlan_features David Miller
2009-07-23 11:03 ` [PATCH net-next-2.6] bonding: propogate vlan_features to bonding master 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=4A2CDB16.9030000@Voltaire.com \
--to=ogerlitz@voltaire$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=fubar@us$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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