aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/rfkill-input.c9
-rw-r--r--net/rfkill/rfkill.c3
2 files changed, 12 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index 9f746be58854..8e4516a5fe32 100644
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -81,6 +81,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
81 81
82static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN); 82static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
83static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH); 83static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);
84static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);
84 85
85static void rfkill_event(struct input_handle *handle, unsigned int type, 86static void rfkill_event(struct input_handle *handle, unsigned int type,
86 unsigned int code, int down) 87 unsigned int code, int down)
@@ -93,6 +94,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
93 case KEY_BLUETOOTH: 94 case KEY_BLUETOOTH:
94 rfkill_schedule_toggle(&rfkill_bt); 95 rfkill_schedule_toggle(&rfkill_bt);
95 break; 96 break;
97 case KEY_UWB:
98 rfkill_schedule_toggle(&rfkill_uwb);
99 break;
96 default: 100 default:
97 break; 101 break;
98 } 102 }
@@ -148,6 +152,11 @@ static const struct input_device_id rfkill_ids[] = {
148 .evbit = { BIT(EV_KEY) }, 152 .evbit = { BIT(EV_KEY) },
149 .keybit = { [LONG(KEY_BLUETOOTH)] = BIT(KEY_BLUETOOTH) }, 153 .keybit = { [LONG(KEY_BLUETOOTH)] = BIT(KEY_BLUETOOTH) },
150 }, 154 },
155 {
156 .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
157 .evbit = { BIT(EV_KEY) },
158 .keybit = { [LONG(KEY_UWB)] = BIT(KEY_UWB) },
159 },
151 { } 160 { }
152}; 161};
153 162
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 50e010272e47..03ed7fd8afe0 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -106,6 +106,9 @@ static ssize_t rfkill_type_show(struct device *dev,
106 case RFKILL_TYPE_BLUETOOTH: 106 case RFKILL_TYPE_BLUETOOTH:
107 type = "bluetooth"; 107 type = "bluetooth";
108 break; 108 break;
109 case RFKILL_TYPE_UWB:
110 type = "ultrawideband";
111 break;
109 default: 112 default:
110 BUG(); 113 BUG();
111 } 114 }