1 files changed, 4 insertions, 10 deletions

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 745e2cb87c96..c5244b309640 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -765,16 +765,10 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock,
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
         skb_reset_network_header(skb);
 
-        if (dev->hard_header) {
-                int res;
-                err = -EINVAL;
-                res = dev->hard_header(skb, dev, ntohs(proto), addr, NULL, len);
-                if (sock->type != SOCK_DGRAM) {
-                        skb_reset_tail_pointer(skb);
-                        skb->len = 0;
-                } else if (res < 0)
-                        goto out_free;
-        }
+        err = -EINVAL;
+        if (sock->type == SOCK_DGRAM &&
+            dev_hard_header(skb, dev, ntohs(proto), addr, NULL, len) < 0)
+                goto out_free;
 
         /* Returns -EFAULT on error */
         err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);