2 files changed, 3 insertions, 5 deletions

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index acc94214bde6..e84c924a81ee 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -181,7 +181,7 @@ static void iucv_sock_close(struct sock *sk)
         default:
                 sock_set_flag(sk, SOCK_ZAPPED);
                 break;
-        };
+        }
 
         release_sock(sk);
         iucv_sock_kill(sk);
@@ -953,8 +953,8 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg)
                         return;
                 }
 
-                skb->h.raw = skb->data;
-                skb->nh.raw = skb->data;
+                skb_reset_transport_header(skb);
+                skb_reset_network_header(skb);
                 skb->len = msg->length;
         }
 
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 1b10d576f222..60f293842a39 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -519,7 +519,6 @@ static void iucv_disable(void)
         kfree(iucv_path_table);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
                                      unsigned long action, void *hcpu)
 {
@@ -565,7 +564,6 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
 static struct notifier_block iucv_cpu_notifier = {
         .notifier_call = iucv_cpu_notify,
 };
-#endif
 
 /**
  * iucv_sever_pathid