From b7317bfe2911f792ead028db80d5797ba18ac166 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 15 Oct 2021 10:06:49 -0400
Subject: [PATCH] Remove choices from rf_channel_width

---
 netbox/dcim/api/serializers.py          |  1 -
 netbox/dcim/forms/filtersets.py         |  6 ++----
 netbox/dcim/forms/models.py             |  1 -
 netbox/dcim/forms/object_create.py      |  4 +---
 netbox/dcim/models/device_components.py |  3 +--
 netbox/templates/dcim/interface.html    |  2 +-
 netbox/wireless/choices.py              | 15 ---------------
 7 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index d7857d5e8..d2a9125c0 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -637,7 +637,6 @@ class InterfaceSerializer(PrimaryModelSerializer, LinkTerminationSerializer, Con
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     rf_role = ChoiceField(choices=WirelessRoleChoices, required=False, allow_null=True)
     rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False)
-    rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices, required=False, allow_null=True)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
     tagged_vlans = SerializedPKRelatedField(
         queryset=VLAN.objects.all(),
diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py
index 50954e534..fb9449d41 100644
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -1014,11 +1014,9 @@ class InterfaceFilterForm(DeviceComponentFilterForm):
         widget=StaticSelectMultiple(),
         label='Wireless channel'
     )
-    rf_channel_width = forms.MultipleChoiceField(
-        choices=WirelessChannelWidthChoices,
+    rf_channel_width = forms.IntegerField(
         required=False,
-        widget=StaticSelectMultiple(),
-        label='Channel width'
+        label='Channel width (kHz)'
     )
     tag = TagFilterField(model)
 
diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/models.py
index 35b90291e..675319f11 100644
--- a/netbox/dcim/forms/models.py
+++ b/netbox/dcim/forms/models.py
@@ -1117,7 +1117,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm):
             'mode': StaticSelect(),
             'rf_role': StaticSelect(),
             'rf_channel': StaticSelect(),
-            'rf_channel_width': StaticSelect(),
         }
         labels = {
             'mode': '802.1Q Mode',
diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py
index ff8a19d47..f924fb5d9 100644
--- a/netbox/dcim/forms/object_create.py
+++ b/netbox/dcim/forms/object_create.py
@@ -480,10 +480,8 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
         widget=StaticSelect(),
         label='Wireless channel'
     )
-    rf_channel_width = forms.ChoiceField(
-        choices=add_blank_choice(WirelessChannelWidthChoices),
+    rf_channel_width = forms.IntegerField(
         required=False,
-        widget=StaticSelect(),
         label='Channel width'
     )
     untagged_vlan = DynamicModelChoiceField(
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 381a2dcf6..bb18e0c26 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -538,10 +538,9 @@ class Interface(ComponentModel, BaseInterface, LinkTermination, PathEndpoint):
         verbose_name='Wireless channel'
     )
     rf_channel_width = models.PositiveSmallIntegerField(
-        choices=WirelessChannelWidthChoices,
         blank=True,
         null=True,
-        verbose_name='Channel width'
+        verbose_name='Channel width (kHz)'
     )
     wireless_link = models.ForeignKey(
         to='wireless.WirelessLink',
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 90c9497ef..427ea8352 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -278,7 +278,7 @@
                             </tr>
                             <tr>
                                 <th scope="row">Channel Width</th>
-                                <td>{{ object.get_rf_channel_width_display|placeholder }}</td>
+                                <td>{{ object.rf_channel_width|placeholder }}</td>
                             </tr>
                         </table>
                     </div>
diff --git a/netbox/wireless/choices.py b/netbox/wireless/choices.py
index f33bf75a1..1369ee340 100644
--- a/netbox/wireless/choices.py
+++ b/netbox/wireless/choices.py
@@ -165,18 +165,3 @@ class WirelessChannelChoices(ChoiceSet):
             )
         ),
     )
-
-
-class WirelessChannelWidthChoices(ChoiceSet):
-
-    CHANNEL_WIDTH_20 = 20
-    CHANNEL_WIDTH_40 = 40
-    CHANNEL_WIDTH_80 = 80
-    CHANNEL_WIDTH_160 = 160
-
-    CHOICES = (
-        (CHANNEL_WIDTH_20, '20 MHz'),
-        (CHANNEL_WIDTH_40, '40 MHz'),
-        (CHANNEL_WIDTH_80, '80 MHz'),
-        (CHANNEL_WIDTH_160, '160 MHz'),
-    )