]> git.karo-electronics.de Git - karo-tx-linux.git/commit
igb: only use vlan_gro_receive if vlans are registered
authorAlexander Duyck <alexander.h.duyck@intel.com>
Tue, 23 Mar 2010 18:35:18 +0000 (18:35 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Jan 2011 22:43:13 +0000 (14:43 -0800)
commit8edb98f38b17e10d64f87b0eafd2612597896a82
treea87cab879ed5c5d37df9b105e97329d32e2beafc
parentda53fa015ad6242ca95ee48c62feaf9cf1084bd2
igb: only use vlan_gro_receive if vlans are registered

commit 31b24b955c3ebbb6f3008a6374e61cf7c05a193c upstream.

This change makes it so that vlan_gro_receive is only used if vlans have been
registered to the adapter structure.  Previously we were just sending all vlan
tagged frames in via this function but this results in a null pointer
dereference when vlans are not registered.

[ This fixes bugzilla entry 15582 -Eric Dumazet]

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/igb/igb_main.c