aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-03-25 10:27:32 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:19:45 -0500
commitb5e868edbeaa5fd832d42563195c0da00edfd3c9 (patch)
tree6dc2ffb85ed92d39c4978961cce43ba96a205ad0 /drivers/net
parentd1ca6c4ff6714826acb1a434e5d3862984eb26d5 (diff)
[PATCH] bcm43xx: remove some compilerwarnings.
Signed-off-by: Michael Buesch <mbuesch@freenet.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_dma.c1
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c10
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_wx.c55
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_xmit.c7
4 files changed, 13 insertions, 60 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index bad5374b81b9..c3681b8f09b4 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -787,7 +787,6 @@ int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
787void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm, 787void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
788 struct bcm43xx_xmitstatus *status) 788 struct bcm43xx_xmitstatus *status)
789{ 789{
790 struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
791 struct bcm43xx_dmaring *ring; 790 struct bcm43xx_dmaring *ring;
792 struct bcm43xx_dmadesc *desc; 791 struct bcm43xx_dmadesc *desc;
793 struct bcm43xx_dmadesc_meta *meta; 792 struct bcm43xx_dmadesc_meta *meta;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 29df4f844c9b..ac9a8dd1ab8f 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -404,6 +404,8 @@ static void bcm43xx_write_mac_bssid_templates(struct bcm43xx_private *bcm)
404 bcm43xx_ram_write(bcm, 0x478 + i, *((u32 *)(mac_bssid + i))); 404 bcm43xx_ram_write(bcm, 0x478 + i, *((u32 *)(mac_bssid + i)));
405} 405}
406 406
407//FIXME: Well, we should probably call them from somewhere.
408#if 0
407static void bcm43xx_set_slot_time(struct bcm43xx_private *bcm, u16 slot_time) 409static void bcm43xx_set_slot_time(struct bcm43xx_private *bcm, u16 slot_time)
408{ 410{
409 /* slot_time is in usec. */ 411 /* slot_time is in usec. */
@@ -422,8 +424,12 @@ static void bcm43xx_short_slot_timing_disable(struct bcm43xx_private *bcm)
422{ 424{
423 bcm43xx_set_slot_time(bcm, 20); 425 bcm43xx_set_slot_time(bcm, 20);
424} 426}
427#endif
425 428
426//FIXME: rename this func? 429/* FIXME: To get the MAC-filter working, we need to implement the
430 * following functions (and rename them :)
431 */
432#if 0
427static void bcm43xx_disassociate(struct bcm43xx_private *bcm) 433static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
428{ 434{
429 bcm43xx_mac_suspend(bcm); 435 bcm43xx_mac_suspend(bcm);
@@ -451,7 +457,6 @@ static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
451 bcm43xx_mac_enable(bcm); 457 bcm43xx_mac_enable(bcm);
452} 458}
453 459
454//FIXME: rename this func?
455static void bcm43xx_associate(struct bcm43xx_private *bcm, 460static void bcm43xx_associate(struct bcm43xx_private *bcm,
456 const u8 *mac) 461 const u8 *mac)
457{ 462{
@@ -462,6 +467,7 @@ static void bcm43xx_associate(struct bcm43xx_private *bcm,
462 bcm43xx_write_mac_bssid_templates(bcm); 467 bcm43xx_write_mac_bssid_templates(bcm);
463 bcm43xx_mac_enable(bcm); 468 bcm43xx_mac_enable(bcm);
464} 469}
470#endif
465 471
466/* Enable a Generic IRQ. "mask" is the mask of which IRQs to enable. 472/* Enable a Generic IRQ. "mask" is the mask of which IRQs to enable.
467 * Returns the _previously_ enabled IRQ mask. 473 * Returns the _previously_ enabled IRQ mask.
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index e72be32bda75..3daee828ef4b 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -106,7 +106,6 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
106 char *extra) 106 char *extra)
107{ 107{
108 struct bcm43xx_private *bcm = bcm43xx_priv(net_dev); 108 struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
109 struct ieee80211softmac_device *softmac = bcm->softmac;
110 unsigned long flags; 109 unsigned long flags;
111 u8 channel; 110 u8 channel;
112 int freq; 111 int freq;
@@ -205,24 +204,6 @@ static int bcm43xx_wx_get_mode(struct net_device *net_dev,
205 return 0; 204 return 0;
206} 205}
207 206
208static int bcm43xx_wx_set_sensitivity(struct net_device *net_dev,
209 struct iw_request_info *info,
210 union iwreq_data *data,
211 char *extra)
212{
213 /*TODO*/
214 return 0;
215}
216
217static int bcm43xx_wx_get_sensitivity(struct net_device *net_dev,
218 struct iw_request_info *info,
219 union iwreq_data *data,
220 char *extra)
221{
222 /*TODO*/
223 return 0;
224}
225
226static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev, 207static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
227 struct iw_request_info *info, 208 struct iw_request_info *info,
228 union iwreq_data *data, 209 union iwreq_data *data,
@@ -517,24 +498,6 @@ out_unlock:
517 return err; 498 return err;
518} 499}
519 500
520static int bcm43xx_wx_set_retry(struct net_device *net_dev,
521 struct iw_request_info *info,
522 union iwreq_data *data,
523 char *extra)
524{
525 /*TODO*/
526 return 0;
527}
528
529static int bcm43xx_wx_get_retry(struct net_device *net_dev,
530 struct iw_request_info *info,
531 union iwreq_data *data,
532 char *extra)
533{
534 /*TODO*/
535 return 0;
536}
537
538static int bcm43xx_wx_set_encoding(struct net_device *net_dev, 501static int bcm43xx_wx_set_encoding(struct net_device *net_dev,
539 struct iw_request_info *info, 502 struct iw_request_info *info,
540 union iwreq_data *data, 503 union iwreq_data *data,
@@ -587,24 +550,6 @@ static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
587 return err; 550 return err;
588} 551}
589 552
590static int bcm43xx_wx_set_power(struct net_device *net_dev,
591 struct iw_request_info *info,
592 union iwreq_data *data,
593 char *extra)
594{
595 /*TODO*/
596 return 0;
597}
598
599static int bcm43xx_wx_get_power(struct net_device *net_dev,
600 struct iw_request_info *info,
601 union iwreq_data *data,
602 char *extra)
603{
604 /*TODO*/
605 return 0;
606}
607
608static int bcm43xx_wx_set_interfmode(struct net_device *net_dev, 553static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
609 struct iw_request_info *info, 554 struct iw_request_info *info,
610 union iwreq_data *data, 555 union iwreq_data *data,
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index 9c37478c80d9..d8ece28c079f 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -215,7 +215,7 @@ static void bcm43xx_generate_rts(const struct bcm43xx_phyinfo *phy,
215 u8 fallback_bitrate; 215 u8 fallback_bitrate;
216 int ofdm_modulation; 216 int ofdm_modulation;
217 int fallback_ofdm_modulation; 217 int fallback_ofdm_modulation;
218 u8 *sa, *da; 218// u8 *sa, *da;
219 u16 flen; 219 u16 flen;
220 220
221//FIXME sa = ieee80211_get_SA((struct ieee80211_hdr *)wlhdr); 221//FIXME sa = ieee80211_get_SA((struct ieee80211_hdr *)wlhdr);
@@ -267,7 +267,7 @@ assert(dur);
267//printk(BCM43xx_MACFMT " " BCM43xx_MACFMT " " BCM43xx_MACFMT "\n", BCM43xx_MACARG(wlhdr->addr1), BCM43xx_MACARG(wlhdr->addr2), BCM43xx_MACARG(wlhdr->addr3)); 267//printk(BCM43xx_MACFMT " " BCM43xx_MACFMT " " BCM43xx_MACFMT "\n", BCM43xx_MACARG(wlhdr->addr1), BCM43xx_MACARG(wlhdr->addr2), BCM43xx_MACARG(wlhdr->addr3));
268//printk(BCM43xx_MACFMT " " BCM43xx_MACFMT "\n", BCM43xx_MACARG(sa), BCM43xx_MACARG(da)); 268//printk(BCM43xx_MACFMT " " BCM43xx_MACFMT "\n", BCM43xx_MACARG(sa), BCM43xx_MACARG(da));
269 memcpy(txhdr->rts_cts_mac1, wlhdr->addr1, ETH_ALEN);//FIXME! 269 memcpy(txhdr->rts_cts_mac1, wlhdr->addr1, ETH_ALEN);//FIXME!
270 memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN); 270// memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN);
271 271
272 *flags |= BCM43xx_TXHDRFLAG_RTSCTS; 272 *flags |= BCM43xx_TXHDRFLAG_RTSCTS;
273 *flags |= BCM43xx_TXHDRFLAG_RTS; 273 *flags |= BCM43xx_TXHDRFLAG_RTS;
@@ -439,6 +439,8 @@ static s8 bcm43xx_rssi_postprocess(struct bcm43xx_private *bcm,
439 return (s8)tmp; 439 return (s8)tmp;
440} 440}
441 441
442//TODO
443#if 0
442static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm, 444static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
443 u8 in_rssi) 445 u8 in_rssi)
444{ 446{
@@ -453,6 +455,7 @@ static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
453 455
454 return ret; 456 return ret;
455} 457}
458#endif
456 459
457int bcm43xx_rx(struct bcm43xx_private *bcm, 460int bcm43xx_rx(struct bcm43xx_private *bcm,
458 struct sk_buff *skb, 461 struct sk_buff *skb,