diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-10 15:23:11 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-10 15:23:11 -0700 |
| commit | 2528dbd348dd541e090594b7aac3f62351078388 (patch) | |
| tree | a2ddf8323359b85d4be7de3ba498d7ec18e6e3f3 /net/wireless/sme.c | |
| parent | d109c1ac070c962c4332015d06a008345a44a02c (diff) | |
| parent | 17b3b28baf84999421d56dce68c4b1c1ec7f1ef3 (diff) | |
Merge branch 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.06-android
* 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android:
fix: align closely to AOSP.
sched: cpufreq: update power usage only if cpufreq_stat is enabled
uid_cputime: Extends the cputime functionality to report power per uid
sched: cpufreq: Adds a field cpu_power in the task_struct
cpufreq_stats: Adds the fucntionality to load current values for each frequency for all the cores.
New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
net/unix: sk_socket can disappear when state is unlocked
selinux: enable genfscon labeling for sysfs and pstore files
ext4: don't save the error information if the block device is read-only
selinux: enable per-file labeling for debugfs files.
cpufreq: interactive: Rearm governor timer at max freq
cpufreq: interactive: Implement cluster-based min_sample_time
cpufreq: interactive: Exercise hispeed settings at a policy level
suspend: Return error when pending wakeup source is found.
proc: uid_cputime: fix show_uid_stat permission
nf: IDLETIMER: Fix broken uid field in the msg
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index efe76c6a320a..760722f9126b 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -428,18 +428,11 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, if (!rdev->ops->auth || !rdev->ops->assoc) return -EOPNOTSUPP; -#ifndef CONFIG_CFG80211_ALLOW_RECONNECT if (wdev->current_bss) return -EALREADY; if (WARN_ON(wdev->conn)) return -EINPROGRESS; -#else - if (wdev->conn) { - kfree(wdev->conn); - wdev->conn = NULL; - } -#endif wdev->conn = kzalloc(sizeof(*wdev->conn), GFP_KERNEL); if (!wdev->conn) |