Merge tag 'efi-urgent' into x86/urgent

 * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/net/tipc/core.c b/net/tipc/core.c
index c6d3f75a9e1b..f9e88d8b04ca 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -82,8 +82,7 @@ struct sk_buff *tipc_buf_acquire(u32 size)
 static void tipc_core_stop_net(void)
 {
         tipc_net_stop();
-        tipc_eth_media_stop();
-        tipc_ib_media_stop();
+        tipc_bearer_cleanup();
 }
 
 /**
@@ -94,10 +93,7 @@ int tipc_core_start_net(unsigned long addr)
         int res;
 
         tipc_net_start(addr);
-        res = tipc_eth_media_start();
-        if (res < 0)
-                goto err;
-        res = tipc_ib_media_start();
+        res = tipc_bearer_setup();
         if (res < 0)
                 goto err;
         return res;