| Message ID | 4AF99160.2060607@trash.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 10 Nov 2009 17:14:24 +0100 Patrick McHardy <kaber@trash.net> wrote: > vlan/macvlan: propagate transmission state to upper layers > > Both vlan and macvlan devices usually don't use a qdisc and immediately > queue packets to the underlying device. Propagate transmission state of > the underlying device to the upper layers so they can react on congestion > and/or inform the sending process. > > Signed-off-by: Patrick McHardy <kaber@trash.net> Bridging and bonding have same issue, but the solution is more difficult. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Stephen Hemminger wrote: > On Tue, 10 Nov 2009 17:14:24 +0100 > Patrick McHardy <kaber@trash.net> wrote: > >> vlan/macvlan: propagate transmission state to upper layers >> >> Both vlan and macvlan devices usually don't use a qdisc and immediately >> queue packets to the underlying device. Propagate transmission state of >> the underlying device to the upper layers so they can react on congestion >> and/or inform the sending process. >> >> Signed-off-by: Patrick McHardy <kaber@trash.net> > > > Bridging and bonding have same issue, but the solution is more difficult. Yes, in both cases the packet might be sent out on multiple interfaces, so its not really clear which state we should propagate. I guess it would make sense to indicate an error if transmission on *all* interfaces fail, but I'm not sure about the other cases. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
commit 21fb413b55abb4665e057b884c289bb780f41b3c
Author: Patrick McHardy <kaber@trash.net>
Date: Tue Nov 10 16:55:50 2009 +0100
vlan/macvlan: propagate transmission state to upper layers
Both vlan and macvlan devices usually don't use a qdisc and immediately
queue packets to the underlying device. Propagate transmission state of
the underlying device to the upper layers so they can react on congestion
and/or inform the sending process.
Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d7dba3f..271aa7e 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -202,7 +202,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
} else
txq->tx_dropped++;
- return NETDEV_TX_OK;
+ return ret;
}
static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 790fd55..9159659 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -332,7 +332,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
} else
txq->tx_dropped++;
- return NETDEV_TX_OK;
+ return ret;
}
static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
@@ -358,7 +358,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
} else
txq->tx_dropped++;
- return NETDEV_TX_OK;
+ return ret;
}
static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)