aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-20 06:08:12 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:27 -0500
commitc2976ab005695c1b73f9dbdb4d0f85ed5e0319eb (patch)
tree9ae04d26bd2d2a227fc5fad3a6ea82a8d9d80778
parente63e3fa7bd4d0dc8cbab5ab7aff84cd37d45295e (diff)
p54: fix sparse warnings
This fixes a few sparse warnings in p54. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/p54common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c
index 424de9f4d5e7..9ae3be43156a 100644
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@ -59,7 +59,7 @@ static struct ieee80211_channel p54_channels[] = {
59 { .center_freq = 2484, .hw_value = 14, }, 59 { .center_freq = 2484, .hw_value = 14, },
60}; 60};
61 61
62struct ieee80211_supported_band band_2GHz = { 62static struct ieee80211_supported_band band_2GHz = {
63 .channels = p54_channels, 63 .channels = p54_channels,
64 .n_channels = ARRAY_SIZE(p54_channels), 64 .n_channels = ARRAY_SIZE(p54_channels),
65 .bitrates = p54_rates, 65 .bitrates = p54_rates,
@@ -389,7 +389,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
389 while (entry != (struct sk_buff *)&priv->tx_queue) { 389 while (entry != (struct sk_buff *)&priv->tx_queue) {
390 range = (struct memrecord *)&entry->cb; 390 range = (struct memrecord *)&entry->cb;
391 if (range->start_addr == addr) { 391 if (range->start_addr == addr) {
392 struct ieee80211_tx_status status = {{0}}; 392 struct ieee80211_tx_status status;
393 struct p54_control_hdr *entry_hdr; 393 struct p54_control_hdr *entry_hdr;
394 struct p54_tx_control_allocdata *entry_data; 394 struct p54_tx_control_allocdata *entry_data;
395 int pad = 0; 395 int pad = 0;
@@ -405,6 +405,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
405 kfree_skb(entry); 405 kfree_skb(entry);
406 break; 406 break;
407 } 407 }
408 memset(&status, 0, sizeof(status));
408 memcpy(&status.control, range->control, 409 memcpy(&status.control, range->control,
409 sizeof(status.control)); 410 sizeof(status.control));
410 kfree(range->control); 411 kfree(range->control);