* [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
@ 2005-03-03 23:33 Jay Vosburgh
2005-03-03 23:37 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Jay Vosburgh @ 2005-03-03 23:33 UTC (permalink / raw)
To: netdev; +Cc: Olaf Kirch
Change the bonding driver to not drop non-VLAN traffic when a
VLAN is configured above it. Originally fixed by Olaf Kirch
<okir@suse.de>; I changed his patch slightly to update comments.
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
--- linux-2.6.11-rc4-netdev1-virgin/drivers/net/bonding/bond_main.c 2005-02-15 11:31:40.000000000 -0800
+++ linux-2.6.11-rc4-netdev1/drivers/net/bonding/bond_main.c 2005-02-15 16:09:10.000000000 -0800
@@ -793,29 +793,20 @@
* @skb: hw accel VLAN tagged skb to transmit
* @slave_dev: slave that is supposed to xmit this skbuff
*
- * When the bond gets an skb to tarnsmit that is
+ * When the bond gets an skb to transmit that is
* already hardware accelerated VLAN tagged, and it
* needs to relay this skb to a slave that is not
* hw accel capable, the skb needs to be "unaccelerated",
* i.e. strip the hwaccel tag and re-insert it as part
* of the payload.
- *
- * Assumption - once a VLAN device is created over the bond device, all
- * packets are going to be hardware accelerated VLAN tagged since the IP
- * binding is done over the VLAN device
*/
int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
{
unsigned short vlan_id;
- int res;
if (!list_empty(&bond->vlan_list) &&
- !(slave_dev->features & NETIF_F_HW_VLAN_TX)) {
- res = vlan_get_tag(skb, &vlan_id);
- if (res) {
- return -EINVAL;
- }
-
+ !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
+ vlan_get_tag(skb, &vlan_id) == 0) {
skb->dev = slave_dev;
skb = vlan_put_tag(skb, vlan_id);
if (!skb) {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
2005-03-03 23:33 [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic Jay Vosburgh
@ 2005-03-03 23:37 ` Jeff Garzik
2005-03-04 0:02 ` Jay Vosburgh
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2005-03-03 23:37 UTC (permalink / raw)
To: Jay Vosburgh; +Cc: netdev, Olaf Kirch
Jay Vosburgh wrote:
> Change the bonding driver to not drop non-VLAN traffic when a
> VLAN is configured above it. Originally fixed by Olaf Kirch
> <okir@suse.de>; I changed his patch slightly to update comments.
Does this go on top of, or underneath, your pile of bonding patches that
I merged into netdev-2.6?
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
2005-03-03 23:37 ` Jeff Garzik
@ 2005-03-04 0:02 ` Jay Vosburgh
0 siblings, 0 replies; 5+ messages in thread
From: Jay Vosburgh @ 2005-03-04 0:02 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, Olaf Kirch
Jeff Garzik <jgarzik@pobox.com> wrote:
>Does this go on top of, or underneath, your pile of bonding patches
>that I merged into netdev-2.6?
On top of. I just checked it, and it applies ok for me to
2.6.11 plus your netdev1 patch from this morning.
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
@ 2005-03-31 20:23 Jay Vosburgh
2005-04-01 4:41 ` David S. Miller
0 siblings, 1 reply; 5+ messages in thread
From: Jay Vosburgh @ 2005-03-31 20:23 UTC (permalink / raw)
To: netdev
Posted this a few weeks ago, don't see it in netdev-2.6 yet.
Did this get lost somewhere, or is it still pending?
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
To: netdev@oss.sgi.com
Cc: Olaf Kirch <okir@suse.de>
Subject: [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
Date: Thu, 03 Mar 2005 15:33:11 -0800
From: Jay Vosburgh <fubar@us.ibm.com>
Change the bonding driver to not drop non-VLAN traffic when a
VLAN is configured above it. Originally fixed by Olaf Kirch
<okir@suse.de>; I changed his patch slightly to update comments.
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
--- linux-2.6.11-rc4-netdev1-virgin/drivers/net/bonding/bond_main.c 2005-02-15 11:31:40.000000000 -0800
+++ linux-2.6.11-rc4-netdev1/drivers/net/bonding/bond_main.c 2005-02-15 16:09:10.000000000 -0800
@@ -793,29 +793,20 @@
* @skb: hw accel VLAN tagged skb to transmit
* @slave_dev: slave that is supposed to xmit this skbuff
*
- * When the bond gets an skb to tarnsmit that is
+ * When the bond gets an skb to transmit that is
* already hardware accelerated VLAN tagged, and it
* needs to relay this skb to a slave that is not
* hw accel capable, the skb needs to be "unaccelerated",
* i.e. strip the hwaccel tag and re-insert it as part
* of the payload.
- *
- * Assumption - once a VLAN device is created over the bond device, all
- * packets are going to be hardware accelerated VLAN tagged since the IP
- * binding is done over the VLAN device
*/
int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
{
unsigned short vlan_id;
- int res;
if (!list_empty(&bond->vlan_list) &&
- !(slave_dev->features & NETIF_F_HW_VLAN_TX)) {
- res = vlan_get_tag(skb, &vlan_id);
- if (res) {
- return -EINVAL;
- }
-
+ !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
+ vlan_get_tag(skb, &vlan_id) == 0) {
skb->dev = slave_dev;
skb = vlan_put_tag(skb, vlan_id);
if (!skb) {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic
2005-03-31 20:23 Jay Vosburgh
@ 2005-04-01 4:41 ` David S. Miller
0 siblings, 0 replies; 5+ messages in thread
From: David S. Miller @ 2005-04-01 4:41 UTC (permalink / raw)
To: Jay Vosburgh; +Cc: netdev
On Thu, 31 Mar 2005 12:23:43 -0800
Jay Vosburgh <fubar@us.ibm.com> wrote:
>
> Posted this a few weeks ago, don't see it in netdev-2.6 yet.
> Did this get lost somewhere, or is it still pending?
Sorry, I thought Jeff would pick this one up.
I've applied it to my tree, thanks Jay.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-04-01 4:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-03 23:33 [PATCH REPOST 2.6.11-rc4-netdev1] bonding: don't drop non-VLAN traffic Jay Vosburgh
2005-03-03 23:37 ` Jeff Garzik
2005-03-04 0:02 ` Jay Vosburgh
-- strict thread matches above, loose matches on Subject: below --
2005-03-31 20:23 Jay Vosburgh
2005-04-01 4:41 ` David S. Miller
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).