diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-15 19:45:16 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 16:05:55 -0400 |
| commit | 074d46d1d23f27488a3f314e29cae2453541f17d (patch) | |
| tree | c6abb99637c808f6eb9da722c3197cc980ce1a98 /drivers/net/wireless/wl12xx/main.c | |
| parent | f69b9c79c99b607a8d6b1d9e1913861154af8c63 (diff) | |
| download | blackbird-op-linux-074d46d1d23f27488a3f314e29cae2453541f17d.tar.gz blackbird-op-linux-074d46d1d23f27488a3f314e29cae2453541f17d.zip | |
wireless: rename ht_info to ht_operation
Since some of the HT code pre-dates 802.11n-2009
some names are wrong. The one that bothers me most
is that "HT operation" is called "HT information"
in our code and that causes confusion.
Rename "HT information" to "HT operation" and also
the control_chan field to primary_chan to match
the name used in the spec.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 39002363611e..b1555fb5815b 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -232,7 +232,7 @@ static struct conf_drv_settings default_conf = { .rule = CONF_BCN_RULE_PASS_ON_APPEARANCE, }, [1] = { - .ie = WLAN_EID_HT_INFORMATION, + .ie = WLAN_EID_HT_OPERATION, .rule = CONF_BCN_RULE_PASS_ON_CHANGE, }, }, |
