diff --git a/net/core/dev.c b/net/core/dev.c
index 4b667b0..b36063e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4107,6 +4107,12 @@
 	orig_dev = skb->dev;
 
 	skb_reset_network_header(skb);
+
+	/* Memmove frame if IP header is not aligned on a four byte boundary.
+	 * This is only a temporary solution until Quantenna found a more
+	 * permanent solution. */
+	ip_hdr_aligned(skb);
+
 	if (!skb_transport_header_was_set(skb))
 		skb_reset_transport_header(skb);
 	skb_reset_mac_len(skb);