diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2017-10-12 23:00:09 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-12-05 10:58:28 +0100 |
| commit | 239f7ba8a285d737aa9ef2f52dbc078d2b2f5371 (patch) | |
| tree | bc48b8de8f7117e1c3da30eb9612e5e4c60ca4a7 | |
| parent | 4e26661e67c4bde6f2a5314fb4130844a32b9f54 (diff) | |
filter: remove bogus TTY virtual console filter
The more generic filter for virtual devices already covers all cases
covered by the TTY virtual console filter.
| -rw-r--r-- | src/mm-base-manager.c | 1 | ||||
| -rw-r--r-- | src/mm-filter.c | 15 | ||||
| -rw-r--r-- | src/mm-filter.h | 7 |
3 files changed, 6 insertions, 17 deletions
diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c index 04369092..cb328d04 100644 --- a/src/mm-base-manager.c +++ b/src/mm-base-manager.c @@ -1131,7 +1131,6 @@ initable_init (GInitable *initable, MM_FILTER_RULE_NET | MM_FILTER_RULE_CDC_WDM | MM_FILTER_RULE_TTY | - MM_FILTER_RULE_TTY_VIRTUAL_CONSOLE | MM_FILTER_RULE_TTY_BLACKLIST | MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY | MM_FILTER_RULE_TTY_PLATFORM_DRIVER); diff --git a/src/mm-filter.c b/src/mm-filter.c index 68bd2231..4f9e4c79 100644 --- a/src/mm-filter.c +++ b/src/mm-filter.c @@ -72,14 +72,6 @@ mm_filter_port (MMFilter *self, (g_strcmp0 (subsystem, "tty") == 0)) { const gchar *physdev_subsystem; - /* Filter out virtual consoles (e.g. tty0, tty1, tty2...) */ - if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_VIRTUAL_CONSOLE) && - (name && strncmp (name, "tty", 3) == 0) && - (g_ascii_isdigit (name[3]))) { - mm_dbg ("[filter] (%s/%s) port filtered: virtual console", subsystem, name); - return FALSE; - } - /* Ignore blacklisted tty devices. */ if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_BLACKLIST) && (mm_kernel_device_get_global_property_as_boolean (port, "ID_MM_DEVICE_IGNORE"))) { @@ -132,10 +124,9 @@ mm_filter_new (MMFilterRule enabled_rules) mm_dbg ("[filter] cdc-wdm devices allowed: %s", RULE_ENABLED_STR (MM_FILTER_RULE_CDC_WDM)); mm_dbg ("[filter] tty devices allowed: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY)); if (self->priv->enabled_rules & MM_FILTER_RULE_TTY) { - mm_dbg ("[filter] virtual consoles filtered: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_VIRTUAL_CONSOLE)); - mm_dbg ("[filter] blacklist applied: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_BLACKLIST)); - mm_dbg ("[filter] manual scan only applied: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY)); - mm_dbg ("[filter] platform driver check: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_PLATFORM_DRIVER)); + mm_dbg ("[filter] blacklist applied: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_BLACKLIST)); + mm_dbg ("[filter] manual scan only applied: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY)); + mm_dbg ("[filter] platform driver check: %s", RULE_ENABLED_STR (MM_FILTER_RULE_TTY_PLATFORM_DRIVER)); } #undef RULE_ENABLED_STR diff --git a/src/mm-filter.h b/src/mm-filter.h index a3eae936..80a31594 100644 --- a/src/mm-filter.h +++ b/src/mm-filter.h @@ -49,10 +49,9 @@ typedef enum { /*< underscore_name=mm_filter_rule >*/ MM_FILTER_RULE_NET = 1 << 1, MM_FILTER_RULE_CDC_WDM = 1 << 2, MM_FILTER_RULE_TTY = 1 << 3, - MM_FILTER_RULE_TTY_VIRTUAL_CONSOLE = 1 << 4, - MM_FILTER_RULE_TTY_BLACKLIST = 1 << 5, - MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY = 1 << 6, - MM_FILTER_RULE_TTY_PLATFORM_DRIVER = 1 << 7, + MM_FILTER_RULE_TTY_BLACKLIST = 1 << 4, + MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY = 1 << 5, + MM_FILTER_RULE_TTY_PLATFORM_DRIVER = 1 << 6, } MMFilterRule; MMFilter *mm_filter_new (MMFilterRule enabled_rules); |