redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

rtl8180: detect rtl8187se card

Browse source 
Add case to detect the rtl8187se card and its RF frontend.
In this case set also accordingly mac80211 queue number.

Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Andrea Merello 2014-03-26 21:04:05 +01:00 committed by John W. Linville
parent e944b0af86
commit 24b5fbf9d8
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/wireless/rtl818x/rtl8180/dev.c
View file

@ -1740,6 +1740,12 @@ static int rtl8180_probe(struct pci_dev *pdev,
chip_name = "RTL8185vD";
priv->chip_family = RTL818X_CHIP_FAMILY_RTL8185;
break;
case RTL818X_TX_CONF_RTL8187SE:
chip_name = "RTL8187SE";
priv->chip_family = RTL818X_CHIP_FAMILY_RTL8187SE;
break;
default:
printk(KERN_ERR "%s (rtl8180): Unknown chip! (0x%x)\n",
pci_name(pdev), reg >> 25);
@ -1753,7 +1759,10 @@ static int rtl8180_probe(struct pci_dev *pdev,
* with mac80211, however the beacon queue is an exception and it
* is mapped on the highst tx ring IDX.
*/
dev->queues = RTL8180_NR_TX_QUEUES - 1;
if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE)
dev->queues = RTL8187SE_NR_TX_QUEUES - 1;
else
dev->queues = RTL8180_NR_TX_QUEUES - 1;
if (priv->chip_family != RTL818X_CHIP_FAMILY_RTL8180) {
priv->band.n_bitrates = ARRAY_SIZE(rtl818x_rates);
@ -1773,7 +1782,11 @@ static int rtl8180_probe(struct pci_dev *pdev,
break;
case 5: priv->rf = &grf5101_rf_ops;
break;
case 9: priv->rf = rtl8180_detect_rf(dev);
case 9:
if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE)
priv->rf = rtl8187se_detect_rf(dev);
else
priv->rf = rtl8180_detect_rf(dev);
break;
case 10:
rf_name = "RTL8255";