From: Tony Cheneau <tony.cheneau@amnesiak.org>
Date: Mon, 25 Mar 2013 17:59:24 +0000 (+0000)
Subject: mac802154: turn on ACK when enabled by the upper layers
X-Git-Tag: MMI-PSA29.97-13-9~14469^2~336^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf692061d0d575f1b9b614555ca392d8b8eabab3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac802154: turn on ACK when enabled by the upper layers

Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index d20c6d3c247d..7d3f6594ed4f 100644
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -145,6 +145,8 @@ static int mac802154_header_create(struct sk_buff *skb,
 
 	head[pos++] = mac_cb(skb)->seq; /* DSN/BSN */
 	fc = mac_cb_type(skb);
+	if (mac_cb_is_ackreq(skb))
+		fc |= IEEE802154_FC_ACK_REQ;
 
 	if (!saddr) {
 		spin_lock_bh(&priv->mib_lock);