2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index d86f645a76da..2db409330c21 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -645,7 +645,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
                 }
                 QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, OSA_ADDR_LEN);
         } else {
-                random_ether_addr(card->dev->dev_addr);
+                eth_random_addr(card->dev->dev_addr);
                 memcpy(card->dev->dev_addr, vendor_pre, 3);
         }
         return 0;
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index f0045ca8a766..0cf706699a04 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1471,7 +1471,7 @@ static int qeth_l3_iqd_read_initial_mac_cb(struct qeth_card *card,
                 memcpy(card->dev->dev_addr,
                         cmd->data.create_destroy_addr.unique_id, ETH_ALEN);
         else
-                random_ether_addr(card->dev->dev_addr);
+                eth_random_addr(card->dev->dev_addr);
 
         return 0;
 }
@@ -2698,10 +2698,11 @@ int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
         rcu_read_lock();
         dst = skb_dst(skb);
         if (dst)
-                n = dst_get_neighbour_noref(dst);
+                n = dst_neigh_lookup_skb(dst, skb);
         if (n) {
                 cast_type = n->type;
                 rcu_read_unlock();
+                neigh_release(n);
                 if ((cast_type == RTN_BROADCAST) ||
                     (cast_type == RTN_MULTICAST) ||
                     (cast_type == RTN_ANYCAST))