Patched in Tegra support.

1 files changed, 11 insertions, 14 deletions

diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 16705611589..faecf648123 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -44,8 +44,8 @@ struct dgram_sock {
         struct ieee802154_addr src_addr;
         struct ieee802154_addr dst_addr;
 
-        unsigned int bound:1;
-        unsigned int want_ack:1;
+        unsigned bound:1;
+        unsigned want_ack:1;
 };
 
 static inline struct dgram_sock *dgram_sk(const struct sock *sk)
@@ -206,10 +206,9 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
                 struct msghdr *msg, size_t size)
 {
         struct net_device *dev;
-        unsigned int mtu;
+        unsigned mtu;
         struct sk_buff *skb;
         struct dgram_sock *ro = dgram_sk(sk);
-        int hlen, tlen;
         int err;
 
         if (msg->msg_flags & MSG_OOB) {
@@ -230,21 +229,13 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
         mtu = dev->mtu;
         pr_debug("name = %s, mtu = %u\n", dev->name, mtu);
 
-        if (size > mtu) {
-                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
-                err = -EINVAL;
-                goto out_dev;
-        }
-
-        hlen = LL_RESERVED_SPACE(dev);
-        tlen = dev->needed_tailroom;
-        skb = sock_alloc_send_skb(sk, hlen + tlen + size,
+        skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + size,
                         msg->msg_flags & MSG_DONTWAIT,
                         &err);
         if (!skb)
                 goto out_dev;
 
-        skb_reserve(skb, hlen);
+        skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
         skb_reset_network_header(skb);
 
@@ -264,6 +255,12 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
         if (err < 0)
                 goto out_skb;
 
+        if (size > mtu) {
+                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
+                err = -EINVAL;
+                goto out_skb;
+        }
+
         skb->dev = dev;
         skb->sk  = sk;
         skb->protocol = htons(ETH_P_IEEE802154);