diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /net/bridge/br_forward.c | |
| parent | 1d76efe1577b4323609b1bcbfafa8b731eda071a (diff) | |
| parent | 23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/br_forward.c')
| -rw-r--r-- | net/bridge/br_forward.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index e9466d412707..02015a505d2a 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -65,7 +65,7 @@ static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb) { skb->dev = to->dev; - if (unlikely(netpoll_tx_running(to->dev))) { + if (unlikely(netpoll_tx_running(to->br->dev))) { if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb)) kfree_skb(skb); else { |