several missing cpu_to_le16() in ieee80211softmac_capabilities()

on some codepaths we forgot to convert to little-endian as we do on the
rest of them and as the caller expects from us.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Al Viro 2007-12-29 04:08:15 -05:00 коммит произвёл David S. Miller
Родитель 8fffc15dc7
Коммит b16f13d00c
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -148,11 +148,11 @@ ieee80211softmac_hdr_3addr(struct ieee80211softmac_device *mac,
* shouldn't the sequence number be in ieee80211? */ * shouldn't the sequence number be in ieee80211? */
} }
static u16 static __le16
ieee80211softmac_capabilities(struct ieee80211softmac_device *mac, ieee80211softmac_capabilities(struct ieee80211softmac_device *mac,
struct ieee80211softmac_network *net) struct ieee80211softmac_network *net)
{ {
u16 capability = 0; __le16 capability = 0;
/* ESS and IBSS bits are set according to the current mode */ /* ESS and IBSS bits are set according to the current mode */
switch (mac->ieee->iw_mode) { switch (mac->ieee->iw_mode) {
@ -163,8 +163,8 @@ ieee80211softmac_capabilities(struct ieee80211softmac_device *mac,
capability = cpu_to_le16(WLAN_CAPABILITY_IBSS); capability = cpu_to_le16(WLAN_CAPABILITY_IBSS);
break; break;
case IW_MODE_AUTO: case IW_MODE_AUTO:
capability = net->capabilities & capability = cpu_to_le16(net->capabilities &
(WLAN_CAPABILITY_ESS|WLAN_CAPABILITY_IBSS); (WLAN_CAPABILITY_ESS|WLAN_CAPABILITY_IBSS));
break; break;
default: default:
/* bleh. we don't ever go to these modes */ /* bleh. we don't ever go to these modes */
@ -182,7 +182,7 @@ ieee80211softmac_capabilities(struct ieee80211softmac_device *mac,
/* Short Preamble */ /* Short Preamble */
/* Always supported: we probably won't ever be powering devices which /* Always supported: we probably won't ever be powering devices which
* dont support this... */ * dont support this... */
capability |= WLAN_CAPABILITY_SHORT_PREAMBLE; capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
/* PBCC */ /* PBCC */
/* Not widely used */ /* Not widely used */