networking: make skb_push & __skb_push return void pointers

[linux-2.6-block.git] / drivers / net / wireless / admtek / adm8211.c

diff --git a/drivers/net/wireless/admtek/adm8211.c b/drivers/net/wireless/admtek/adm8211.c
index ed626f568b5802006473e077affd4f417f850917..3b0802fc5bf5daaa8b46bfc28879ad9c3dc0bb2b 100644 (file)
--- a/drivers/net/wireless/admtek/adm8211.c
+++ b/drivers/net/wireless/admtek/adm8211.c
@@ -390,9 +390,9 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
                                        priv->pdev,
                                        priv->rx_buffers[entry].mapping,
                                        pktlen, PCI_DMA_FROMDEVICE);
-                               memcpy(skb_put(skb, pktlen),
-                                      skb_tail_pointer(priv->rx_buffers[entry].skb),
-                                      pktlen);
+                               skb_put_data(skb,
+                                            skb_tail_pointer(priv->rx_buffers[entry].skb),
+                                            pktlen);
                                pci_dma_sync_single_for_device(
                                        priv->pdev,
                                        priv->rx_buffers[entry].mapping,
@@ -1700,7 +1700,7 @@ static void adm8211_tx(struct ieee80211_hw *dev,
        skb_pull(skb, hdrlen);
        payload_len = skb->len;
 
-       txhdr = (struct adm8211_tx_hdr *) skb_push(skb, sizeof(*txhdr));
+       txhdr = skb_push(skb, sizeof(*txhdr));
        memset(txhdr, 0, sizeof(*txhdr));
        memcpy(txhdr->da, ieee80211_get_DA(hdr), ETH_ALEN);
        txhdr->signal = plcp_signal;