]> git.karo-electronics.de Git - karo-tx-linux.git/commit
qeth: repair crash in qeth_l3_vlan_rx_kill_vid()
authorFrank Blaschka <frank.blaschka@de.ibm.com>
Tue, 24 Jul 2012 22:34:29 +0000 (22:34 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:22:55 +0000 (08:22 -0700)
commitdc249d0f2c815d6af901d12253fc1cf215773f01
treef6a093bf24616dcdd9d435818d24fbbf7a2ee2d0
parentbe142c0eac7a427fe4c7e4564466be9d826fefd4
qeth: repair crash in qeth_l3_vlan_rx_kill_vid()

commit eabfbe6230ee7363681e7a561948d362b87169f0 upstream.

Commit efc73f4b "net: Fix memory leak - vlan_info struct" adds deletion of
VLAN 0 for devices with feature NETIF_F_HW_VLAN_FILTER. For driver
qeth these are the layer 3 devices. Usually there exists no
separate vlan net_device for VLAN 0. Thus the qeth functions
qeth_l3_free_vlan_addresses4() and qeth_l3_free_vlan_addresses6()
require an extra checking if function __vlan_find_dev_deep()
returns with a net_device.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/s390/net/qeth_l3_main.c