pci: hotplug: pciehp: fix error code path in hpc_power_off_slot

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_main.c

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index a2d08c9ba3c4a9fe49885445c599353d8d2d8085..62606ce26e5562bdd1bc6a5a8447c283951ab57d 100644 (file)
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -3890,7 +3890,7 @@ qeth_verify_vlan_dev(struct net_device *dev, struct qeth_card *card)
                        break;
                }
        }
-       if (rc && !(VLAN_DEV_INFO(dev)->real_dev->priv == (void *)card))
+       if (rc && !(vlan_dev_info(dev)->real_dev->priv == (void *)card))
                return 0;
 
 #endif
@@ -3930,7 +3930,7 @@ qeth_get_card_from_dev(struct net_device *dev)
                card = (struct qeth_card *)dev->priv;
        else if (rc == QETH_VLAN_CARD)
                card = (struct qeth_card *)
-                       VLAN_DEV_INFO(dev)->real_dev->priv;
+                       vlan_dev_info(dev)->real_dev->priv;
 
        QETH_DBF_TEXT_(trace, 4, "%d", rc);
        return card ;
@@ -6643,7 +6643,8 @@ qeth_netdev_init(struct net_device *dev)
        dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
        dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
 #endif
-       dev->header_ops = &qeth_null_ops;
+       if (qeth_get_netdev_flags(card) & IFF_NOARP)
+               dev->header_ops = &qeth_null_ops;
 
 #ifdef CONFIG_QETH_IPV6
        /*IPv6 address autoconfiguration stuff*/
@@ -8339,7 +8340,7 @@ qeth_arp_constructor(struct neighbour *neigh)
        neigh->parms = neigh_parms_clone(parms);
        rcu_read_unlock();
 
-       neigh->type = inet_addr_type(*(__be32 *) neigh->primary_key);
+       neigh->type = inet_addr_type(&init_net, *(__be32 *) neigh->primary_key);
        neigh->nud_state = NUD_NOARP;
        neigh->ops = arp_direct_ops;
        neigh->output = neigh->ops->queue_xmit;