Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	net/bluetooth/Makefile

1 files changed, 16 insertions, 4 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index bf3b5748ee19..0fa36aa6701a 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -612,10 +612,22 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                                                     num_rx_inperiod++;
                                 }
 
-                                if (unlikely(!rtl_action_proc(hw, skb, false)))
+                                if (unlikely(!rtl_action_proc(hw, skb,
+                                    false))) {
                                         dev_kfree_skb_any(skb);
-                                else
-                                        ieee80211_rx_irqsafe(hw, skb);
+                                } else {
+                                        struct sk_buff *uskb = NULL;
+                                        u8 *pdata;
+                                        uskb = dev_alloc_skb(skb->len + 128);
+                                        memcpy(IEEE80211_SKB_RXCB(uskb),
+                                                        &rx_status,
+                                                        sizeof(rx_status));
+                                        pdata = (u8 *)skb_put(uskb, skb->len);
+                                        memcpy(pdata, skb->data, skb->len);
+                                        dev_kfree_skb_any(skb);
+
+                                        ieee80211_rx_irqsafe(hw, uskb);
+                                }
                         } else {
                                 dev_kfree_skb_any(skb);
                         }
@@ -1608,7 +1620,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                 pcipriv->ndis_adapter.pcibridge_funcnum =
                     PCI_FUNC(bridge_pdev->devfn);
                 pcipriv->ndis_adapter.pcibridge_pciehdr_offset =
-                    bridge_pdev->pcie_cap;
+                    pci_pcie_cap(bridge_pdev);
                 pcipriv->ndis_adapter.pcicfg_addrport =
                     (pcipriv->ndis_adapter.pcibridge_busnum << 16) |
                     (pcipriv->ndis_adapter.pcibridge_devnum << 11) |