mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h
This commit is contained in:
commit
0a0e9ae1bd
358 changed files with 3306 additions and 1967 deletions
|
|
@ -805,11 +805,11 @@ int cfg80211_wext_siwfreq(struct net_device *dev,
|
|||
return freq;
|
||||
if (freq == 0)
|
||||
return -EINVAL;
|
||||
wdev_lock(wdev);
|
||||
mutex_lock(&rdev->devlist_mtx);
|
||||
wdev_lock(wdev);
|
||||
err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT);
|
||||
mutex_unlock(&rdev->devlist_mtx);
|
||||
wdev_unlock(wdev);
|
||||
mutex_unlock(&rdev->devlist_mtx);
|
||||
return err;
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
|
|
|
|||
Loading…
Reference in a new issue