Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / net / wireless / intel / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 5b79e2e..9368abd 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -10272,8 +10272,9 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb,
 
                                printk(KERN_INFO "Adding frag %d %d...\n",
                                       j, size);
-                               memcpy(skb_put(skb, size),
-                                      txb->fragments[j]->data + hdr_len, size);
+                               skb_put_data(skb,
+                                            txb->fragments[j]->data + hdr_len,
+                                            size);
                        }
                        dev_kfree_skb_any(txb->fragments[i]);
                        txb->fragments[i] = skb;
@@ -10368,7 +10369,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
                if (!dst)
                        continue;
 
-               rt_hdr = (void *)skb_put(dst, sizeof(*rt_hdr));
+               rt_hdr = skb_put(dst, sizeof(*rt_hdr));
 
                rt_hdr->it_version = PKTHDR_RADIOTAP_VERSION;
                rt_hdr->it_pad = 0;