mac80211: move TX station pointer and restructure TX

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rtl818x / rtl8180 / dev.c

diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2bebcb71a1e946c122f26ceb293f306904256ac9..021d83e1b1d3367d0ff19954324c4306dc6b8f42 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -47,6 +47,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = {
        { PCI_DEVICE(0x1799, 0x6001) },
        { PCI_DEVICE(0x1799, 0x6020) },
        { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x3300) },
+       { PCI_DEVICE(0x1186, 0x3301) },
+       { PCI_DEVICE(0x1432, 0x7106) },
        { }
 };
 
@@ -242,7 +244,9 @@ static irqreturn_t rtl8180_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static void rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+static void rtl8180_tx(struct ieee80211_hw *dev,
+                      struct ieee80211_tx_control *control,
+                      struct sk_buff *skb)
 {
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
@@ -708,7 +712,7 @@ static void rtl8180_beacon_work(struct work_struct *work)
        /* TODO: use actual beacon queue */
        skb_set_queue_mapping(skb, 0);
 
-       rtl8180_tx(dev, skb);
+       rtl8180_tx(dev, NULL, skb);
 
 resched:
        /*
@@ -1076,7 +1080,7 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
        if (!is_valid_ether_addr(mac_addr)) {
                printk(KERN_WARNING "%s (rtl8180): Invalid hwaddr! Using"
                       " randomly generated MAC addr\n", pci_name(pdev));
-               random_ether_addr(mac_addr);
+               eth_random_addr(mac_addr);
        }
        SET_IEEE80211_PERM_ADDR(dev, mac_addr);