colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/device-p2p-wifi: drop unused code

Browse Source 
If this is going to be implemented, revert the patch.
This commit is contained in:
Thomas Haller
2019-01-28 11:54:23 +01:00
parent 37da2d8a06
commit c8204377d6
2 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/devices/wifi/nm-device-p2p-wifi.c
View File

@@ -48,8 +48,6 @@ _LOG_DECLARE_SELF(NMDeviceP2PWifi);
NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceP2PWifi, NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceP2PWifi,
PROP_GROUP_OWNER, PROP_GROUP_OWNER,
//PROP_SSID,
//PROP_BSSID,
PROP_PEERS, PROP_PEERS,
PROP_WFDIES, /* TODO: Make this a property of the setting and Find feature PROP_WFDIES, /* TODO: Make this a property of the setting and Find feature
* making the device stateless. * making the device stateless.
@@ -58,14 +56,6 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceP2PWifi,
PROP_MGMT_IFACE, PROP_MGMT_IFACE,
); );
enum {
SCANNING_PROHIBITED,
LAST_SIGNAL
};
//static guint signals[LAST_SIGNAL] = { 0 };
typedef struct { typedef struct {
NMSupplicantManager *sup_mgr; NMSupplicantManager *sup_mgr;
@@ -554,12 +544,6 @@ peer_add_remove (NMDeviceP2PWifi *self,
} }
update_disconnect_on_connection_peer_missing (self); update_disconnect_on_connection_peer_missing (self);
#if 0
nm_device_emit_recheck_auto_activate (NM_DEVICE (self));
if (recheck_available_connections)
nm_device_recheck_available_connections (NM_DEVICE (self));
#endif
} }
static void static void
@@ -961,11 +945,6 @@ device_state_changed (NMDevice *device,
NMDeviceP2PWifi *self = NM_DEVICE_P2P_WIFI (device); NMDeviceP2PWifi *self = NM_DEVICE_P2P_WIFI (device);
NMDeviceP2PWifiPrivate *priv = NM_DEVICE_P2P_WIFI_GET_PRIVATE (self); NMDeviceP2PWifiPrivate *priv = NM_DEVICE_P2P_WIFI_GET_PRIVATE (self);
#if 0
if (new_state > NM_DEVICE_STATE_ACTIVATED)
wifi_secrets_cancel (self);
#endif
update_disconnect_on_connection_peer_missing (self); update_disconnect_on_connection_peer_missing (self);
if (new_state <= NM_DEVICE_STATE_UNAVAILABLE) { if (new_state <= NM_DEVICE_STATE_UNAVAILABLE) {
@@ -1356,11 +1335,5 @@ nm_device_p2p_wifi_class_init (NMDeviceP2PWifiClass *klass)
G_PARAM_CONSTRUCT_ONLY | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
/* obj_properties[PROP_SCANNING] = */
/* g_param_spec_boolean (NM_DEVICE_WIFI_SCANNING, "", "", */
/* FALSE, */
/* G_PARAM_READABLE | */
/* G_PARAM_STATIC_STRINGS); */
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
} }

11
src/devices/wifi/nm-wifi-p2p-peer.c
View File

@@ -43,23 +43,12 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMWifiP2PPeer,
PROP_MODEL, PROP_MODEL,
PROP_MODEL_NUMBER, PROP_MODEL_NUMBER,
PROP_SERIAL, PROP_SERIAL,
//PROP_PRIMARY_DEVICE_TYPE, { "PrimaryDeviceType", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
// "devicecapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
// "groupcapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
// "SecondaryDeviceTypes", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
// "VendorExtension", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
PROP_WFD_IES, PROP_WFD_IES,
PROP_GROUPS, PROP_GROUPS,
PROP_HW_ADDRESS, PROP_HW_ADDRESS,
//PROP_MODE,
PROP_STRENGTH, PROP_STRENGTH,
PROP_LAST_SEEN, PROP_LAST_SEEN,
//PROP_MAX_BITRATE,
// One of the following (FLAGS would simply mirror/use the same as AP flags)
PROP_FLAGS, PROP_FLAGS,
//PROP_CONFIG_METHOD,
); );
struct _NMWifiP2PPeerPrivate { struct _NMWifiP2PPeerPrivate {