From: Michael Wu <flamingice@sourmilk.net>
To: Andrew Morton <akpm@google.com>
Cc: linux-wireless@vger.kernel.org, John Linville <linville@tuxdriver.com>
Subject: Re: wireless warnings
Date: Wed, 16 May 2007 02:15:28 -0400 [thread overview]
Message-ID: <200705160215.33458.flamingice@sourmilk.net> (raw)
In-Reply-To: <20070515152845.f27b49b5.akpm@google.com>
[-- Attachment #1.1: Type: text/plain, Size: 330 bytes --]
On Tuesday 15 May 2007 18:28, Andrew Morton wrote:
> Some of these are pointing at serious bustage. The kind which goes oops.
The adm8211 and p54 warnings are from the recent sk_buff_data_t changes that
make skb->tail an offset on 64 bit.
Attached patches fix adm8211 and p54. John, please apply.
Thanks,
-Michael Wu
[-- Attachment #1.2: 01-adm8211-skb-api-update.diff --]
[-- Type: text/x-diff, Size: 1713 bytes --]
adm8211: use skb_tail_pointer instead of skb->tail
From: Michael Wu <flamingice@sourmilk.net>
This makes adm8211 use skb_tail_pointer instead of skb->tail.
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---
drivers/net/wireless/mac80211/adm8211/adm8211.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mac80211/adm8211/adm8211.c b/drivers/net/wireless/mac80211/adm8211/adm8211.c
index f0b8a2d..0795ea7 100644
--- a/drivers/net/wireless/mac80211/adm8211/adm8211.c
+++ b/drivers/net/wireless/mac80211/adm8211/adm8211.c
@@ -499,7 +499,7 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
priv->rx_buffers[entry].mapping,
pktlen, PCI_DMA_FROMDEVICE);
memcpy(skb_put(skb, pktlen),
- priv->rx_buffers[entry].skb->tail,
+ skb_tail_pointer(priv->rx_buffers[entry].skb),
pktlen);
pci_dma_sync_single_for_device(
priv->pdev,
@@ -518,7 +518,7 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
priv->rx_buffers[entry].skb = newskb;
priv->rx_buffers[entry].mapping =
pci_map_single(priv->pdev,
- newskb->tail,
+ skb_tail_pointer(newskb),
RX_PKT_SIZE,
PCI_DMA_FROMDEVICE);
} else {
@@ -1537,7 +1537,8 @@ static int adm8211_init_rings(struct ieee80211_hw *dev)
rx_info->skb = dev_alloc_skb(RX_PKT_SIZE);
if (rx_info->skb == NULL)
break;
- rx_info->mapping = pci_map_single(priv->pdev, rx_info->skb->tail,
+ rx_info->mapping = pci_map_single(priv->pdev,
+ skb_tail_pointer(rx_info->skb),
RX_PKT_SIZE,
PCI_DMA_FROMDEVICE);
desc->buffer1 = cpu_to_le32(rx_info->mapping);
[-- Attachment #1.3: 02-p54-skb-api-update.diff --]
[-- Type: text/x-diff, Size: 2004 bytes --]
p54: use skb_tail_pointer instead of skb->tail
From: Michael Wu <flamingice@sourmilk.net>
This makes p54 use skb_tail_pointer instead of skb->tail.
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---
drivers/net/wireless/mac80211/p54/prism54pci.c | 3 ++-
drivers/net/wireless/mac80211/p54/prism54usb.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mac80211/p54/prism54pci.c b/drivers/net/wireless/mac80211/p54/prism54pci.c
index 0db7026..5de5726 100644
--- a/drivers/net/wireless/mac80211/p54/prism54pci.c
+++ b/drivers/net/wireless/mac80211/p54/prism54pci.c
@@ -256,7 +256,8 @@ static void p54p_refill_rx_ring(struct ieee80211_hw *dev)
if (!skb)
break;
- mapping = pci_map_single(priv->pdev, skb->tail,
+ mapping = pci_map_single(priv->pdev,
+ skb_tail_pointer(skb),
MAX_RX_SIZE,
PCI_DMA_FROMDEVICE);
desc->host_addr = cpu_to_le32(mapping);
diff --git a/drivers/net/wireless/mac80211/p54/prism54usb.c b/drivers/net/wireless/mac80211/p54/prism54usb.c
index d52131c..e65da2d 100644
--- a/drivers/net/wireless/mac80211/p54/prism54usb.c
+++ b/drivers/net/wireless/mac80211/p54/prism54usb.c
@@ -100,7 +100,7 @@ static void p54u_rx_cb(struct urb *urb)
info = (struct p54u_rx_info *) skb->cb;
info->urb = urb;
info->dev = dev;
- urb->transfer_buffer = skb->tail;
+ urb->transfer_buffer = skb_tail_pointer(skb);
urb->context = skb;
skb_queue_tail(&priv->rx_queue, skb);
} else {
@@ -138,7 +138,7 @@ static int p54u_init_urbs(struct ieee80211_hw *dev)
kfree_skb(skb);
break;
}
- usb_fill_bulk_urb(entry, priv->udev, usb_rcvbulkpipe(priv->udev, P54U_PIPE_DATA), skb->tail, MAX_RX_SIZE, p54u_rx_cb, skb);
+ usb_fill_bulk_urb(entry, priv->udev, usb_rcvbulkpipe(priv->udev, P54U_PIPE_DATA), skb_tail_pointer(skb), MAX_RX_SIZE, p54u_rx_cb, skb);
info = (struct p54u_rx_info *) skb->cb;
info->urb = entry;
info->dev = dev;
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
prev parent reply other threads:[~2007-05-16 6:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 22:28 wireless warnings Andrew Morton
2007-05-16 6:15 ` Michael Wu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200705160215.33458.flamingice@sourmilk.net \
--to=flamingice@sourmilk.net \
--cc=akpm@google.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox