diff options
| author | John W. Linville | 2012-10-29 21:05:51 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-10-29 21:05:51 +0100 |
| commit | ab3d59d265e772e734c36fe738809cb1a910f566 (patch) | |
| tree | b6d29908d3d45b078d025341b1cc272ba4c0a6d0 /net/wireless/core.c | |
| parent | ssb: handle BCM43222 in pmu code. (diff) | |
| parent | ath9k: fix stale pointers potentially causing access to free'd skbs (diff) | |
| download | kernel-qcow2-linux-ab3d59d265e772e734c36fe738809cb1a910f566.tar.gz kernel-qcow2-linux-ab3d59d265e772e734c36fe738809cb1a910f566.tar.xz kernel-qcow2-linux-ab3d59d265e772e734c36fe738809cb1a910f566.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/mwifiex/cfg80211.c
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index ce1ad776dfb5..26711f46a3be 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -529,8 +529,7 @@ int wiphy_register(struct wiphy *wiphy) for (i = 0; i < sband->n_channels; i++) { sband->channels[i].orig_flags = sband->channels[i].flags; - sband->channels[i].orig_mag = - sband->channels[i].max_antenna_gain; + sband->channels[i].orig_mag = INT_MAX; sband->channels[i].orig_mpwr = sband->channels[i].max_power; sband->channels[i].band = band; |