[PATCH 24/24] RT2x00: Misc. fixes
From Ivo van Doorn [EMAIL PROTECTED] Misc. fixes * Compile fixes * Code style fixes previously overlooked * Better check of return values of functions Signed-off-by: Ivo van Doorn [EMAIL PROTECTED] --- diff -rU3 wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2400pci.c --- wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-07-26 15:39:52.0 +0200 +++ wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-07-26 15:56:37.0 +0200 @@ -360,7 +360,7 @@ rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0)); } #else /* CONFIG_RT2400PCI_BUTTON */ -static void rt2400pci_button_poll(struct rt2x00_dev *rt2x00dev){} +static void rt2400pci_button_poll(unsigned long data){} #endif /* CONFIG_RT2400PCI_BUTTON */ /* @@ -1520,7 +1520,7 @@ { struct ieee80211_hdr *ieee80211hdr; struct sk_buff *skb; - u16 temp; + u16 frame_control; skb = dev_alloc_skb(IEEE80211_HEADER); if (!skb) @@ -1532,8 +1532,8 @@ memcpy(skb_put(skb, IEEE80211_HEADER), hdr, IEEE80211_HEADER); ieee80211hdr = (struct ieee80211_hdr*)skb-data; - temp = (WLAN_FC_TYPE_CTRL 2) | (WLAN_FC_STYPE_RTS 4); - ieee80211hdr-frame_control = cpu_to_le16(temp); + frame_control = (WLAN_FC_TYPE_CTRL 2) | (WLAN_FC_STYPE_RTS 4); + ieee80211hdr-frame_control = cpu_to_le16(frame_control); ieee80211hdr-duration_id += cpu_to_le16(duration); @@ -1559,7 +1559,7 @@ u16 frame_control; u8 bitrate; int tx_rate; - + /* * Check which rate should be used for this frame. */ @@ -1593,16 +1593,16 @@ */ rt2x00_set_field32(txd-word0, TXD_W0_RETRY_MODE, 0); - if (frame_control WLAN_FC_MOREFRAG) + if (ieee80211_get_morefrag(ieee80211hdr)) rt2x00_set_field32(txd-word0, TXD_W0_MORE_FRAG, 1); else rt2x00_set_field32(txd-word0, TXD_W0_MORE_FRAG, 0); - + if (WLAN_FC_GET_STYPE(frame_control) == WLAN_FC_STYPE_RTS) rt2x00_set_field32(txd-word0, TXD_W0_RTS, 1); else rt2x00_set_field32(txd-word0, TXD_W0_RTS, 0); - + rt2x00_set_field32(txd-word2, TXD_W2_DATABYTE_COUNT, skb-len); /* @@ -1613,10 +1613,9 @@ /* * Convert length to microseconds. */ - residual = get_duration_res(length, - DEVICE_GET_RATE_FIELD(tx_rate, RATE)); - length = get_duration(length, - DEVICE_GET_RATE_FIELD(tx_rate, RATE)); + bitrate = DEVICE_GET_RATE_FIELD(tx_rate, RATE); + residual = get_duration_res(length, bitrate); + length = get_duration(length, bitrate); if (residual) length++; @@ -2627,16 +2626,16 @@ for (i = 0; i 13; i++) { channels[i].chan = i + 1; channels[i].freq = 2407 + ((i + 1) * 5); - channels[i].flag = IEEE80211_CHAN_W_IBSS - | IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; + channels[i].flag = IEEE80211_CHAN_W_IBSS | + IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; channels[i].val = cpu_to_le32(vals[i]); channels[i].antenna_max = 0xff; } channels[13].chan = 14; channels[13].freq = 2484; - channels[13].flag = IEEE80211_CHAN_W_IBSS - | IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; + channels[13].flag = IEEE80211_CHAN_W_IBSS | + IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; channels[13].val = cpu_to_le32(vals[13]); channels[13].antenna_max = 0xff; @@ -2852,9 +2851,10 @@ struct net_device *net_dev; int status; - if (pci_enable_device(pci_dev)) { + status = pci_enable_device(pci_dev); + if (status) { ERROR(Enable device failed.\n); - return -EIO; + return status; } pci_set_master(pci_dev); @@ -2869,9 +2869,9 @@ goto exit_disable_device; } - if (pci_request_regions(pci_dev, pci_name(pci_dev))) { + status = pci_request_regions(pci_dev, pci_name(pci_dev)); + if (status) { ERROR(PCI request regions failed.\n); - status = -EBUSY; goto exit_disable_device; } diff -rU3 wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2500pci.c --- wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-07-26 15:39:52.0 +0200 +++ wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-07-26 15:56:37.0 +0200 @@ -360,7 +360,7 @@ rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0)); } #else /*
Re: [PATCH 24/24] RT2x00: Misc. fixes
From Ivo van Doorn [EMAIL PROTECTED] Misc. fixes * Compile fixes * Code style fixes previously overlooked * Better check of return values of functions Signed-off-by: Ivo van Doorn [EMAIL PROTECTED] diff -rU3 wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2400pci.c --- wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-07-26 15:39:52.0 +0200 +++ wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-07-26 15:56:37.0 +0200 @@ -360,7 +360,7 @@ rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0)); } #else /* CONFIG_RT2400PCI_BUTTON */ -static void rt2400pci_button_poll(struct rt2x00_dev *rt2x00dev){} +static void rt2400pci_button_poll(unsigned long data){} #endif /* CONFIG_RT2400PCI_BUTTON */ /* @@ -1520,7 +1520,7 @@ { struct ieee80211_hdr *ieee80211hdr; struct sk_buff *skb; - u16 temp; + u16 frame_control; skb = dev_alloc_skb(IEEE80211_HEADER); if (!skb) @@ -1532,8 +1532,8 @@ memcpy(skb_put(skb, IEEE80211_HEADER), hdr, IEEE80211_HEADER); ieee80211hdr = (struct ieee80211_hdr*)skb-data; - temp = (WLAN_FC_TYPE_CTRL 2) | (WLAN_FC_STYPE_RTS 4); - ieee80211hdr-frame_control = cpu_to_le16(temp); + frame_control = (WLAN_FC_TYPE_CTRL 2) | (WLAN_FC_STYPE_RTS 4); + ieee80211hdr-frame_control = cpu_to_le16(frame_control); ieee80211hdr-duration_id += cpu_to_le16(duration); @@ -1559,7 +1559,7 @@ u16 frame_control; u8 bitrate; int tx_rate; - + /* * Check which rate should be used for this frame. */ @@ -1593,16 +1593,16 @@ */ rt2x00_set_field32(txd-word0, TXD_W0_RETRY_MODE, 0); - if (frame_control WLAN_FC_MOREFRAG) + if (ieee80211_get_morefrag(ieee80211hdr)) rt2x00_set_field32(txd-word0, TXD_W0_MORE_FRAG, 1); else rt2x00_set_field32(txd-word0, TXD_W0_MORE_FRAG, 0); - + if (WLAN_FC_GET_STYPE(frame_control) == WLAN_FC_STYPE_RTS) rt2x00_set_field32(txd-word0, TXD_W0_RTS, 1); else rt2x00_set_field32(txd-word0, TXD_W0_RTS, 0); - + rt2x00_set_field32(txd-word2, TXD_W2_DATABYTE_COUNT, skb-len); /* @@ -1613,10 +1613,9 @@ /* * Convert length to microseconds. */ - residual = get_duration_res(length, - DEVICE_GET_RATE_FIELD(tx_rate, RATE)); - length = get_duration(length, - DEVICE_GET_RATE_FIELD(tx_rate, RATE)); + bitrate = DEVICE_GET_RATE_FIELD(tx_rate, RATE); + residual = get_duration_res(length, bitrate); + length = get_duration(length, bitrate); if (residual) length++; @@ -2627,16 +2626,16 @@ for (i = 0; i 13; i++) { channels[i].chan = i + 1; channels[i].freq = 2407 + ((i + 1) * 5); - channels[i].flag = IEEE80211_CHAN_W_IBSS - | IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; + channels[i].flag = IEEE80211_CHAN_W_IBSS | + IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; channels[i].val = cpu_to_le32(vals[i]); channels[i].antenna_max = 0xff; } channels[13].chan = 14; channels[13].freq = 2484; - channels[13].flag = IEEE80211_CHAN_W_IBSS - | IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; + channels[13].flag = IEEE80211_CHAN_W_IBSS | + IEEE80211_CHAN_W_ACTIVE_SCAN | IEEE80211_CHAN_W_SCAN; channels[13].val = cpu_to_le32(vals[13]); channels[13].antenna_max = 0xff; @@ -2852,9 +2851,10 @@ struct net_device *net_dev; int status; - if (pci_enable_device(pci_dev)) { + status = pci_enable_device(pci_dev); + if (status) { ERROR(Enable device failed.\n); - return -EIO; + return status; } pci_set_master(pci_dev); @@ -2869,9 +2869,9 @@ goto exit_disable_device; } - if (pci_request_regions(pci_dev, pci_name(pci_dev))) { + status = pci_request_regions(pci_dev, pci_name(pci_dev)); + if (status) { ERROR(PCI request regions failed.\n); - status = -EBUSY; goto exit_disable_device; } diff -rU3 wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2500pci.c --- wireless-dev-reginit/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-07-26 15:39:52.0 +0200 +++ wireless-dev-misc/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-07-26 15:56:37.0 +0200 @@ -360,7 +360,7 @@ rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0)); } #else /* CONFIG_RT2500PCI_BUTTON */