diff --git a/[refs] b/[refs] index d0847694aa81..6d89c2ff32c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e5ab54296a41f590c9cbc976e1c86272f3a7e00 +refs/heads/master: efbbced361f3ff4ff9e85310ccff894185c4d904 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index 42394505bb50..590039cbb146 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -70,6 +70,9 @@ static void macvlan_broadcast(struct sk_buff *skb, struct sk_buff *nskb; unsigned int i; + if (skb->protocol == htons(ETH_P_PAUSE)) + return; + for (i = 0; i < MACVLAN_HASH_SIZE; i++) { hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) { dev = vlan->dev;