mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
53954cf8c5
566 changed files with 6079 additions and 3479 deletions
|
|
@ -21,6 +21,12 @@ bool vlan_do_receive(struct sk_buff **skbp)
|
|||
if (unlikely(!skb))
|
||||
return false;
|
||||
|
||||
if (unlikely(!(vlan_dev->flags & IFF_UP))) {
|
||||
kfree_skb(skb);
|
||||
*skbp = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
skb->dev = vlan_dev;
|
||||
if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) {
|
||||
/* Our lower layer thinks this is not local, let's make sure.
|
||||
|
|
|
|||
Loading…
Reference in a new issue