Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / drivers / net / wireless / hostap / hostap_ap.c

diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 974a8e5..4ca8a27 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -982,7 +982,8 @@ static void prism2_send_mgmt(struct net_device *dev,
        meta->tx_cb_idx = tx_cb_idx;
 
        skb->dev = dev;
-       skb->mac.raw = skb->nh.raw = skb->data;
+       skb_reset_mac_header(skb);
+       skb_reset_network_header(skb);
        dev_queue_xmit(skb);
 }
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
@@ -1253,7 +1254,7 @@ static char * ap_auth_make_challenge(struct ap_data *ap)
                        return NULL;
        }
 
-       tmpbuf = (char *) kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
+       tmpbuf = kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
        if (tmpbuf == NULL) {
                PDEBUG(DEBUG_AP, "AP: kmalloc failed for challenge\n");
                return NULL;
@@ -1276,8 +1277,8 @@ static char * ap_auth_make_challenge(struct ap_data *ap)
                return NULL;
        }
 
-       memcpy(tmpbuf, skb->data + ap->crypt->extra_mpdu_prefix_len,
-              WLAN_AUTH_CHALLENGE_LEN);
+       skb_copy_from_linear_data_offset(skb, ap->crypt->extra_mpdu_prefix_len,
+                                        tmpbuf, WLAN_AUTH_CHALLENGE_LEN);
        dev_kfree_skb(skb);
 
        return tmpbuf;