diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 18:48:54 -0400 |
| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /net/bridge/br_device.c | |
| parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 (diff) | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) | |
| download | blackbird-op-linux-64c27237a07129758e33f5f824ba5c33b7f57417.tar.gz blackbird-op-linux-64c27237a07129758e33f5f824ba5c33b7f57417.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 0dd01a05bd59..3e2da2cb72db 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -49,14 +49,14 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) brstats->tx_bytes += skb->len; u64_stats_update_end(&brstats->syncp); - if (!br_allowed_ingress(br, br_get_vlan_info(br), skb, &vid)) - goto out; - BR_INPUT_SKB_CB(skb)->brdev = dev; skb_reset_mac_header(skb); skb_pull(skb, ETH_HLEN); + if (!br_allowed_ingress(br, br_get_vlan_info(br), skb, &vid)) + goto out; + if (is_broadcast_ether_addr(dest)) br_flood_deliver(br, skb, false); else if (is_multicast_ether_addr(dest)) { |
