3 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index f1f8bd09bd87..ff50cb4290e4 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -52,7 +52,7 @@ struct b43legacy_dmadesc32 *op32_idx2desc(struct b43legacy_dmaring *ring,
         desc = ring->descbase;
         desc = &(desc[slot]);
 
-        return (struct b43legacy_dmadesc32 *)desc;
+        return desc;
 }
 
 static void op32_fill_descriptor(struct b43legacy_dmaring *ring,
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index eae691e2f7dd..8156135a0590 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1508,7 +1508,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev)
 
 static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
 {
-        b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
+        b43legacyerr(wl, "You must go to http://wireless.kernel.org/en/users/"
                      "Drivers/b43#devicefirmware "
                      "and download the correct firmware (version 3).\n");
 }
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index a8012f2749ee..b8ffea6f5c64 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -269,8 +269,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
         b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                     (&txhdr->plcp), plcp_fragment_len,
                                     rate);
-        b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                    (&txhdr->plcp_fb), plcp_fragment_len,
+        b43legacy_generate_plcp_hdr(&txhdr->plcp_fb, plcp_fragment_len,
                                     rate_fb->hw_value);
 
         /* PHY TX Control word */
@@ -340,8 +339,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                 b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                             (&txhdr->rts_plcp),
                                             len, rts_rate);
-                b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                            (&txhdr->rts_plcp_fb),
+                b43legacy_generate_plcp_hdr(&txhdr->rts_plcp_fb,
                                             len, rts_rate_fb);
                 hdr = (struct ieee80211_hdr *)(&txhdr->rts_frame);
                 txhdr->rts_dur_fb = hdr->duration_id;