1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index c84eadd3602a..65ebee0a3266 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -113,11 +113,9 @@ static inline int iucv_dbf_passes(debug_info_t *dbf_grp, int level)
 #define IUCV_DBF_TEXT_(name, level, text...) \
         do { \
                 if (iucv_dbf_passes(iucv_dbf_##name, level)) { \
-                        char* iucv_dbf_txt_buf = \
-                                        get_cpu_var(iucv_dbf_txt_buf); \
-                        sprintf(iucv_dbf_txt_buf, text); \
-                        debug_text_event(iucv_dbf_##name, level, \
-                                                iucv_dbf_txt_buf); \
+                        char* __buf = get_cpu_var(iucv_dbf_txt_buf); \
+                        sprintf(__buf, text); \
+                        debug_text_event(iucv_dbf_##name, level, __buf); \
                         put_cpu_var(iucv_dbf_txt_buf); \
                 } \
         } while (0)
@@ -161,7 +159,7 @@ static void netiucv_pm_complete(struct device *);
 static int netiucv_pm_freeze(struct device *);
 static int netiucv_pm_restore_thaw(struct device *);
 
-static struct dev_pm_ops netiucv_pm_ops = {
+static const struct dev_pm_ops netiucv_pm_ops = {
         .prepare = netiucv_pm_prepare,
         .complete = netiucv_pm_complete,
         .freeze = netiucv_pm_freeze,
@@ -741,13 +739,13 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg)
         if (single_flag) {
                 if ((skb = skb_dequeue(&conn->commit_queue))) {
                         atomic_dec(&skb->users);
-                        dev_kfree_skb_any(skb);
                         if (privptr) {
                                 privptr->stats.tx_packets++;
                                 privptr->stats.tx_bytes +=
                                         (skb->len - NETIUCV_HDRLEN
-                                                  - NETIUCV_HDRLEN);
+                                                  - NETIUCV_HDRLEN);
                         }
+                        dev_kfree_skb_any(skb);
                 }
         }
         conn->tx_buff->data = conn->tx_buff->head;