Merge remote-tracking branch 'md/for-next'

[deliverable/linux.git] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 09f26940aba51c044896c449ef2380b918f1ae86..89a687f3c0a33a19dd03b38c0b0b25762a81fe93 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -62,10 +62,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
                goto out;
 
        if (is_broadcast_ether_addr(dest)) {
-               br_flood(br, skb, false, false, true);
+               br_flood(br, skb, BR_PKT_BROADCAST, false, true);
        } else if (is_multicast_ether_addr(dest)) {
                if (unlikely(netpoll_tx_running(dev))) {
-                       br_flood(br, skb, false, false, true);
+                       br_flood(br, skb, BR_PKT_MULTICAST, false, true);
                        goto out;
                }
                if (br_multicast_rcv(br, NULL, skb, vid)) {
@@ -78,11 +78,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
                    br_multicast_querier_exists(br, eth_hdr(skb)))
                        br_multicast_flood(mdst, skb, false, true);
                else
-                       br_flood(br, skb, false, false, true);
+                       br_flood(br, skb, BR_PKT_MULTICAST, false, true);
        } else if ((dst = __br_fdb_get(br, dest, vid)) != NULL) {
                br_forward(dst->dst, skb, false, true);
        } else {
-               br_flood(br, skb, true, false, true);
+               br_flood(br, skb, BR_PKT_UNICAST, false, true);
        }
 out:
        rcu_read_unlock();