Squashed commit of the following:

commit d5d8d09b25cafdfd9f2df08e090be3c714b61e6e
Merge: aba7f6e 5735c99
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Wed Jul 17 12:57:29 2013 -0400

    Merge remote-tracking branch 'cm/cm-10.1' into combocombo

    Conflicts:
    	src/drivers/driver_wext.c
    	wpa_supplicant/wpa_cli.c

    Change-Id: I8ea30cc37469cf31c569db9dcb41271d063d646a

commit 5735c9995574669adeed9380e86fbf0f24287477
Author: Bruno Randolf <br1@einfach.org>
Date:   Fri Mar 22 17:07:19 2013 +0000

    wpa_supplicant: Add get_capability freq

    Add "get_capability freq" command to print a more verbose list of channels and
    frequencies in MHz. The tag "NO_IBSS" is added, if IBSS mode is not allowed on
    a channel. This allows userspace programs to get the frequencies and
    limitations associated with each channel.

    This extends the information already provided in "get_capability channel" but a
    new interface is chosen because of backwards compatibility considerations.

    Signed-hostap: Bruno Randolf <br1@einfach.org>
    Change-Id: Ic05a080b3cdea3ab095127d8c2e86eb16408bb4f

commit 4d11042be9623f74660d930c7bcb82ae6e6fd4df
Author: MDJ <melodydeejay@gmail.com>
Date:   Wed Jul 25 13:30:27 2012 +0800

    wpa_supplicant_8 - Hostapd: Android related changes for sockets

    Android related changes for socket handling.
    Similar to ctrl_iface.c in wpa_supplicant/ctrl_iface.c

    Ported from jellybean (was Change-Id: I3f72f5e4746ccdd007f647a923d41629afc17d94)
    http://review.cyanogenmod.org/20317

    Signed-off-by: Vishal Mahaveer <a0271468@ti.com>
    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: Ibf95b753d60e47fa2e04d7b703c40851d2a13875

commit 4d29f0d12afde09b0f84b8220c5ebeadefde9a8d
Author: Bruno Randolf <br1@einfach.org>
Date:   Thu Feb 28 23:20:24 2013 +0000

    Add capability flag for IBSS and get_capabiliy modes

    Add a driver capability flag for drivers which support IBSS mode and
    set it for nl80211 drivers which have set the NL80211_IFTYPE_ADHOC.

    Add a new option "modes" to "get_capability" which will return
    "AP" and "IBSS" if the corresponding capability flags are set.

    Change-Id: I7991ae49b6ac6bc154d4edb0b01af774f4e8522c

commit a526cad2b2713d368003f40c0a23e89c5ec3d4d2
Author: Bruno Randolf <br1@einfach.org>
Date:   Sat Feb 2 11:10:33 2013 +0000

    Save frequency to network config

    Also save frequency in wpa_config_write_network().

    This is necessary for creating IBSS networks which requires the
    frequency to be set.

    Change-Id: Ic051d1ca1ce3b1d4bad231d46e86c21e818af5de

commit ad60a61170a65d8cd2b4f859f7a97217bd51e8b2
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Feb 27 22:26:36 2013 -0800

    Revert "enable CONFIG_PCSC"

    This reverts commit d04091d01db0ddfb13e0c1279e232bf9c3365cfb.

commit d04091d01db0ddfb13e0c1279e232bf9c3365cfb
Author: Guilhem Lettron <guilhem+github@lettron.fr>
Date:   Sat Jan 5 23:51:51 2013 +0100

    enable CONFIG_PCSC

    try to fix #5203
    http://code.google.com/p/cyanogenmod/issues/detail?id=5203

    As said in the file, we need config_pcsc if config_eap_sim is enable.

commit ee1a2bc6358adb0b85e02fb13dbc77332325d749
Author: Jouni Malinen <jouni@qca.qualcomm.com>
Date:   Thu Oct 11 21:50:57 2012 +0300

    Fix regression in LEAP

    Commit 458cb3019108b6cb8c0c1cab94ae6ebf244eda27 broke LEAP since it
    rejects EAP-Success packet that is used within LEAP and this frame does
    not have a payload. Fix LEAP by relaxing the generic EAP packet
    validation if LEAP has been negotiated.

    Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

commit 581ae3aa1c037b6bc752eae5e35ca204bd7d2b11
Author: Emerson Pinter <dev@pinter.com.br>
Date:   Thu Jan 17 19:20:14 2013 -0200

    nl80211: add ifndef on AP SME condition

    The condition causes problems on driver initialization if the
    NL80211_ATTR_DEVICE_AP_SME is not available. Needs
    BOARD_NO_APSME_ATTR:=true.

    Change-Id: I88e91996d8e6a70f46a5a84d6540bf3d3b628ddd

commit 3b571a6ec9f6ded92addf452ffc3c4b49a9685f9
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Jul 15 17:06:05 2012 +0100

    wext: Re-add support for SIGNAL_POLL and DRIVER

    Both of these are still used by JB, and wext wifi drivers have some
    weird behaviors without it (like a reported poor connection 100% of
    the time)

    Change-Id: I15339dbea4e15831465e2bb52b11675cb20dc34c

commit 261a70c1fedbfe818956f78aae9c677f4e0fbe7b
Author: Andrew Dodd <atd7@cornell.edu>
Date:   Thu Dec 13 00:37:26 2012 -0500

    Use legacy NL80211 STA events for older drivers

    This allows tethering on devices with older bcmdhd
    drivers to be fixed.  It conditionally reverts
    b638fe75d3cb9d21c67386173f10afe65053cc4d
    "nl80211: Use native cfg80211 sta events" for these
    boards.

    Use BOARD_LEGACY_NL80211_STA_EVENTS to enable
    this conditional revert.

    Forward-port to JB MR1, squashed in Steve Kondik's commit
    to handle additional changes.

    Change-Id: I4e436c57819944515455725cfd7ac7eeb31552ca

Change-Id: I96d8db7805cb5f18274c9dfe21d403c90b1f657b