From: John Fastabend <john.r.fastabend@intel.com>
Date: Wed, 12 May 2010 21:31:11 +0000 (+0000)
Subject: net: fix conflict between null_or_orig and null_or_bond
X-Git-Tag: v2.6.35-rc2~4^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2df4a0fa1540c460ec69788ab2a901cc72a75644;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed