nl80211: Fixed a merge issue in an earlier commit for set_freq

This commit is contained in:
Jouni Malinen 2008-11-26 10:52:45 +02:00 committed by Jouni Malinen
parent 446842b101
commit a78d3dbd02

View file

@ -482,6 +482,7 @@ static int i802_set_freq2(void *priv, struct hostapd_freq_params *freq)
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface)); NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq->freq); NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq->freq);
if (freq->ht_enabled) {
switch (freq->sec_channel_offset) { switch (freq->sec_channel_offset) {
case -1: case -1:
NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET, NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
@ -496,6 +497,7 @@ static int i802_set_freq2(void *priv, struct hostapd_freq_params *freq)
NL80211_SEC_CHAN_DISABLED); NL80211_SEC_CHAN_DISABLED);
break; break;
} }
}
if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0) if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
return 0; return 0;