diff options
| author | David S. Miller | 2011-09-22 03:23:13 -0400 |
|---|---|---|
| committer | David S. Miller | 2011-09-22 03:23:13 -0400 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /net/wireless/reg.c | |
| parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 18fc37b6f2bd..2520a1b7e7db 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -851,6 +851,7 @@ static void handle_channel(struct wiphy *wiphy, return; } + chan->beacon_found = false; chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags); chan->max_antenna_gain = min(chan->orig_mag, (int) MBI_TO_DBI(power_rule->max_antenna_gain)); |