tree cf9fb32c112a2b27eaeccd8a825c15505b32e2d9
parent 194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485
author John Fastabend <john.r.fastabend@intel.com> 1273699871 +0000
committer David S. Miller <davem@davemloft.net> 1275474918 -0700

net: fix conflict between null_or_orig and null_or_bond

If a skb is received on an inactive bond that does not meet
the special cases checked for by skb_bond_should_drop it should
only be delivered to exact matches as the comment in
netif_receive_skb() says.

However because null_or_bond could also be null this is not
always true.  This patch renames null_or_bond to orig_or_bond
and initializes it to orig_dev.  This keeps the intent of
null_or_bond to pass frames received on VLAN interfaces stacked
on bonding interfaces without invalidating the statement for
null_or_orig.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>