Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[deliverable/linux.git] / drivers / net / wireless / ath / carl9170 / rx.c

diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 25910a14e79cb1f677d5737011e4156ee0b9f62d..6f6a34155667d0da84fdb5c9d63824ce7d1ac37b 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -161,7 +161,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)
 
 void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
 {
-       struct carl9170_rsp *cmd = (void *) buf;
+       struct carl9170_rsp *cmd = buf;
        struct ieee80211_vif *vif;
 
        if (carl9170_check_sequence(ar, cmd->hdr.seq))
@@ -520,7 +520,7 @@ static u8 *carl9170_find_ie(u8 *data, unsigned int len, u8 ie)
  */
 static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
 {
-       struct ieee80211_hdr *hdr = (void *) data;
+       struct ieee80211_hdr *hdr = data;
        struct ieee80211_tim_ie *tim_ie;
        u8 *tim;
        u8 tim_len;