Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

nlmon: Fix up bitwise logic 

The flags in question contain multiple set bits.  So we should only
print the relevant details if all bits are set, not just one of the
bits.
This commit is contained in:
Denis Kenzior 2015-09-09 08:50:56 -05:00
parent a1c198ab11
commit 3e927ea6c9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitor/nlmon.c
View File

@ -1646,10 +1646,12 @@ static void print_wsc_config_methods(unsigned int level, const char *label,
v = l_get_be16(data);
print_attr(level, "%s:", label);
if (v & WSC_CONFIGURATION_METHOD_PHYSICAL_DISPLAY_PIN)
if ((v & WSC_CONFIGURATION_METHOD_PHYSICAL_DISPLAY_PIN) ==
WSC_CONFIGURATION_METHOD_PHYSICAL_DISPLAY_PIN)
print_attr(level + 1, "Physical Display PIN");
if (v & WSC_CONFIGURATION_METHOD_VIRTUAL_DISPLAY_PIN)
if ((v & WSC_CONFIGURATION_METHOD_VIRTUAL_DISPLAY_PIN) ==
WSC_CONFIGURATION_METHOD_VIRTUAL_DISPLAY_PIN)
print_attr(level + 1, "Virtual Display PIN");
flags = WSC_CONFIGURATION_METHOD_PHYSICAL_DISPLAY_PIN |
@ -1662,10 +1664,12 @@ static void print_wsc_config_methods(unsigned int level, const char *label,
v &= ~WSC_CONFIGURATION_METHOD_P2P;
}
if (v & WSC_CONFIGURATION_METHOD_PHYSICAL_PUSH_BUTTON)
if ((v & WSC_CONFIGURATION_METHOD_PHYSICAL_PUSH_BUTTON) ==
WSC_CONFIGURATION_METHOD_PHYSICAL_PUSH_BUTTON)
print_attr(level + 1, "Physical PushButton");
if (v & WSC_CONFIGURATION_METHOD_VIRTUAL_PUSH_BUTTON)
if ((v & WSC_CONFIGURATION_METHOD_VIRTUAL_PUSH_BUTTON) ==
WSC_CONFIGURATION_METHOD_VIRTUAL_PUSH_BUTTON)
print_attr(level + 1, "Virtual PushButton");
flags = WSC_CONFIGURATION_METHOD_PHYSICAL_PUSH_BUTTON |