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,
 void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
                                    struct bcm43xx_xmitstatus *status)
 {
-        struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
         struct bcm43xx_dmaring *ring;
         struct bcm43xx_dmadesc *desc;
         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)
                 bcm43xx_ram_write(bcm, 0x478 + i, *((u32 *)(mac_bssid + i)));
 }
 
+//FIXME: Well, we should probably call them from somewhere.
+#if 0
 static void bcm43xx_set_slot_time(struct bcm43xx_private *bcm, u16 slot_time)
 {
         /* slot_time is in usec. */
@@ -422,8 +424,12 @@ static void bcm43xx_short_slot_timing_disable(struct bcm43xx_private *bcm)
 {
         bcm43xx_set_slot_time(bcm, 20);
 }
+#endif
 
-//FIXME: rename this func?
+/* FIXME: To get the MAC-filter working, we need to implement the
+ *        following functions (and rename them :)
+ */
+#if 0
 static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
 {
         bcm43xx_mac_suspend(bcm);
@@ -451,7 +457,6 @@ static void bcm43xx_disassociate(struct bcm43xx_private *bcm)
         bcm43xx_mac_enable(bcm);
 }
 
-//FIXME: rename this func?
 static void bcm43xx_associate(struct bcm43xx_private *bcm,
                               const u8 *mac)
 {
@@ -462,6 +467,7 @@ static void bcm43xx_associate(struct bcm43xx_private *bcm,
         bcm43xx_write_mac_bssid_templates(bcm);
         bcm43xx_mac_enable(bcm);
 }
+#endif
 
 /* Enable a Generic IRQ. "mask" is the mask of which IRQs to enable.
  * 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,
                                       char *extra)
 {
         struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
-        struct ieee80211softmac_device *softmac = bcm->softmac;
         unsigned long flags;
         u8 channel;
         int freq;
@@ -205,24 +204,6 @@ static int bcm43xx_wx_get_mode(struct net_device *net_dev,
         return 0;
 }
 
-static int bcm43xx_wx_set_sensitivity(struct net_device *net_dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data,
-                                      char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
-static int bcm43xx_wx_get_sensitivity(struct net_device *net_dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data,
-                                      char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
 static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
                                       struct iw_request_info *info,
                                       union iwreq_data *data,
@@ -517,24 +498,6 @@ out_unlock:
         return err;
 }
 
-static int bcm43xx_wx_set_retry(struct net_device *net_dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *data,
-                                char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
-static int bcm43xx_wx_get_retry(struct net_device *net_dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *data,
-                                char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
 static int bcm43xx_wx_set_encoding(struct net_device *net_dev,
                                    struct iw_request_info *info,
                                    union iwreq_data *data,
@@ -587,24 +550,6 @@ static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
         return err;
 }
 
-static int bcm43xx_wx_set_power(struct net_device *net_dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *data,
-                                char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
-static int bcm43xx_wx_get_power(struct net_device *net_dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *data,
-                                char *extra)
-{
-        /*TODO*/
-        return 0;
-}
-
 static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
                                      struct iw_request_info *info,
                                      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,
         u8 fallback_bitrate;
         int ofdm_modulation;
         int fallback_ofdm_modulation;
-        u8 *sa, *da;
+//      u8 *sa, *da;
         u16 flen;
 
 //FIXME sa = ieee80211_get_SA((struct ieee80211_hdr *)wlhdr);
@@ -267,7 +267,7 @@ assert(dur);
 //printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(wlhdr->addr1), BCM43xx_MACARG(wlhdr->addr2), BCM43xx_MACARG(wlhdr->addr3));
 //printk(BCM43xx_MACFMT "  " BCM43xx_MACFMT "\n", BCM43xx_MACARG(sa), BCM43xx_MACARG(da));
         memcpy(txhdr->rts_cts_mac1, wlhdr->addr1, ETH_ALEN);//FIXME!
-        memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN);
+//      memcpy(txhdr->rts_cts_mac2, sa, ETH_ALEN);
 
         *flags |= BCM43xx_TXHDRFLAG_RTSCTS;
         *flags |= BCM43xx_TXHDRFLAG_RTS;
@@ -439,6 +439,8 @@ static s8 bcm43xx_rssi_postprocess(struct bcm43xx_private *bcm,
         return (s8)tmp;
 }
 
+//TODO
+#if 0
 static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
                                         u8 in_rssi)
 {
@@ -453,6 +455,7 @@ static s8 bcm43xx_rssinoise_postprocess(struct bcm43xx_private *bcm,
 
         return ret;
 }
+#endif
 
 int bcm43xx_rx(struct bcm43xx_private *bcm,
                struct sk_buff *skb,