2 files changed, 5 insertions, 10 deletions

diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index b3cadb626fe0..0f58418748aa 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -721,6 +721,8 @@ struct sk_buff *i2400m_msg_to_dev(struct i2400m *i2400m,
                 ack_timeout = HZ;
         };
 
+        if (unlikely(i2400m->trace_msg_from_user))
+                wimax_msg(&i2400m->wimax_dev, "echo", buf, buf_len, GFP_KERNEL);
         /* The RX path in rx.c will put any response for this message
          * in i2400m->ack_skb and wake us up. If we cancel the wait,
          * we need to change the value of i2400m->ack_skb to something
@@ -755,6 +757,9 @@ struct sk_buff *i2400m_msg_to_dev(struct i2400m *i2400m,
         ack_l3l4_hdr = wimax_msg_data_len(ack_skb, &ack_len);
 
         /* Check the ack and deliver it if it is ok */
+        if (unlikely(i2400m->trace_msg_from_user))
+                wimax_msg(&i2400m->wimax_dev, "echo",
+                          ack_l3l4_hdr, ack_len, GFP_KERNEL);
         result = i2400m_msg_size_check(i2400m, ack_l3l4_hdr, ack_len);
         if (result < 0) {
                 dev_err(dev, "HW BUG? reply to message 0x%04x: %d\n",
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index d33389fd7bd3..ef16c573bb22 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -231,20 +231,10 @@ int i2400m_op_msg_from_user(struct wimax_dev *wimax_dev,
         d_fnstart(4, dev, "(wimax_dev %p [i2400m %p] msg_buf %p "
                   "msg_len %zu genl_info %p)\n", wimax_dev, i2400m,
                   msg_buf, msg_len, genl_info);
-        if (unlikely(i2400m->trace_msg_from_user))
-                wimax_msg(&i2400m->wimax_dev, "echo",
-                          msg_buf, msg_len, GFP_KERNEL);
         ack_skb = i2400m_msg_to_dev(i2400m, msg_buf, msg_len);
         result = PTR_ERR(ack_skb);
         if (IS_ERR(ack_skb))
                 goto error_msg_to_dev;
-        if (unlikely(i2400m->trace_msg_from_user)) {
-                const void *ack_data;
-                size_t ack_len;
-                ack_data = wimax_msg_data_len(ack_skb, &ack_len);
-                wimax_msg(&i2400m->wimax_dev, "echo",
-                          ack_data, ack_len, GFP_KERNEL);
-        }
         result = wimax_msg_send(&i2400m->wimax_dev, ack_skb);
 error_msg_to_dev:
         d_fnend(4, dev, "(wimax_dev %p [i2400m %p] msg_buf %p msg_len %zu "