RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #6540 from zhuoshuguo/fix_netdev2_set_tx_feedback

Browse Source 
gnrc_netdev2: fix ''gnrc_netdev2_set_tx_feedback()'' assert.
This commit is contained in:
Martine Lenders 2017-02-02 10:41:52 +01:00 committed by GitHub
commit e92a2390e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/include/net/gnrc/netdev2.h
View File

@ -193,7 +193,7 @@ static inline void gnrc_netdev2_set_tx_feedback(gnrc_netdev2_t *dev,
{ {
/* check if gnrc_mac_tx_feedback does not collide with /* check if gnrc_mac_tx_feedback does not collide with
* GNRC_NETDEV2_MAC_INFO_RX_STARTED */ * GNRC_NETDEV2_MAC_INFO_RX_STARTED */
assert(txf & GNRC_NETDEV2_MAC_INFO_RX_STARTED); assert(!(txf & GNRC_NETDEV2_MAC_INFO_RX_STARTED));
/* unset previous value */ /* unset previous value */
dev->mac_info &= ~GNRC_NETDEV2_MAC_INFO_TX_FEEDBACK_MASK; dev->mac_info &= ~GNRC_NETDEV2_MAC_INFO_TX_FEEDBACK_MASK;
dev->mac_info |= (uint16_t)(txf & GNRC_NETDEV2_MAC_INFO_TX_FEEDBACK_MASK); dev->mac_info |= (uint16_t)(txf & GNRC_NETDEV2_MAC_INFO_TX_FEEDBACK_MASK);