summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Cheneau <tony.cheneau@amnesiak.org>2013-03-25 18:59:24 +0100
committerDavid S. Miller <davem@davemloft.net>2013-03-26 17:37:55 +0100
commitcf692061d0d575f1b9b614555ca392d8b8eabab3 (patch)
treed3c94e8e4bfdbcd4515084633199cab61c5d176e
parent6lowpan: always enable link-layer acknowledgments (diff)
downloadlinux-cf692061d0d575f1b9b614555ca392d8b8eabab3.tar.xz
linux-cf692061d0d575f1b9b614555ca392d8b8eabab3.zip
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>
-rw-r--r--net/mac802154/wpan.c2
1 files changed, 2 insertions, 0 deletions
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);