← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to src/supplicant-manager/nm-supplicant-interface.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/supplicant-manager/nm-supplicant-interface.c
81
81
        char *                dev;
82
82
        gboolean              is_wireless;
83
83
        gboolean              has_credreq;  /* Whether querying 802.1x credentials is supported */
 
84
        gboolean              fast_supported;
84
85
 
85
86
        char *                object_path;
86
87
        guint32               state;
954
955
        priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
955
956
 
956
957
        nm_supplicant_interface_disconnect (self);
957
 
        
 
958
 
 
959
        /* Make sure the supplicant supports EAP-FAST before trying to send
 
960
         * it an EAP-FAST configuration.
 
961
         */
 
962
        if (nm_supplicant_config_fast_required (cfg) && !priv->fast_supported) {
 
963
                nm_log_warn (LOGD_SUPPLICANT, "EAP-FAST is not supported by the supplicant");
 
964
                return FALSE;
 
965
        }
 
966
 
958
967
        if (priv->cfg)
959
968
                g_object_unref (priv->cfg);
960
969
        priv->cfg = cfg;
1120
1129
nm_supplicant_interface_new (NMSupplicantManager *smgr,
1121
1130
                             const char *ifname,
1122
1131
                             gboolean is_wireless,
 
1132
                             gboolean fast_supported,
1123
1133
                             gboolean start_now)
1124
1134
{
1125
1135
        NMSupplicantInterface *self;
1142
1152
 
1143
1153
                priv->dev = g_strdup (ifname);
1144
1154
                priv->is_wireless = is_wireless;
 
1155
                priv->fast_supported = fast_supported;
1145
1156
 
1146
1157
                if (start_now)
1147
1158
                        interface_add (self, priv->is_wireless);