56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From cbbef5e183079455763fc470ccf69008f92ab4b6 Mon Sep 17 00:00:00 2001
|
|
From: Patrick McHardy <kaber@trash.net>
|
|
Date: Tue, 10 Nov 2009 06:14:24 +0000
|
|
Subject: [PATCH] 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>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/macvlan.c | 2 +-
|
|
net/8021q/vlan_dev.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
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)
|
|
--
|
|
1.7.1
|
|
|