aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-11-10 01:14:24 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-13 17:07:33 -0500
commitcbbef5e183079455763fc470ccf69008f92ab4b6 (patch)
tree04063bfe9498e622623ed3e46155bcbd9b18c9c0 /drivers/net/macvlan.c
parent572a9d7b6fc7f20f573664063324c086be310c42 (diff)
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>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d7dba3f6f763..271aa7e1d033 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,
202 } else 202 } else
203 txq->tx_dropped++; 203 txq->tx_dropped++;
204 204
205 return NETDEV_TX_OK; 205 return ret;
206} 206}
207 207
208static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev, 208static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,