Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b38cbf authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by John W. Linville
Browse files

rt2800: prepare for rt2800*_probe_hw_mode() unification 



Enclose interface specific code in rt2800[pci,usb]_probe_hw_mode()
with rt2x00_intf_is_[pci,usb]() checks.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 726984b6

drivers/net/wireless/rt2x00/rt2800pci.c

+14 −10
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ static const struct rf_channel rf_vals[] = { 


static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

{

	struct rt2x00_chip *chip = &rt2x00dev->chip;

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	struct channel_info *info;

	char *tx_power1;
@@ -1204,6 +1205,8 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HW_SIGNAL_DBM |

	    IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_PS_NULLFUNC_STACK;



	if (rt2x00_intf_is_pci(rt2x00dev))

		rt2x00dev->hw->extra_tx_headroom = TXWI_DESC_SIZE;



	SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
@@ -1219,17 +1222,18 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	spec->supported_bands = SUPPORT_BAND_2GHZ;

	spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;



	if (rt2x00_rf(&rt2x00dev->chip, RF2820) ||

	    rt2x00_rf(&rt2x00dev->chip, RF2720) ||

	    rt2x00_rf(&rt2x00dev->chip, RF3020) ||

	    rt2x00_rf(&rt2x00dev->chip, RF3021) ||

	    rt2x00_rf(&rt2x00dev->chip, RF3022) ||

	    rt2x00_rf(&rt2x00dev->chip, RF2020) ||

	    rt2x00_rf(&rt2x00dev->chip, RF3052)) {

	if (rt2x00_rf(chip, RF2820) ||

	    rt2x00_rf(chip, RF2720) ||

	    (rt2x00_intf_is_pci(rt2x00dev) &&

	     (rt2x00_rf(chip, RF3020) ||

	      rt2x00_rf(chip, RF3021) ||

	      rt2x00_rf(chip, RF3022) ||

	      rt2x00_rf(chip, RF2020) ||

	      rt2x00_rf(chip, RF3052)))) {

		spec->num_channels = 14;

		spec->channels = rf_vals;

	} else if (rt2x00_rf(&rt2x00dev->chip, RF2850) ||

		   rt2x00_rf(&rt2x00dev->chip, RF2750)) {

	} else if (rt2x00_rf(chip, RF2850) ||

		   rt2x00_rf(chip, RF2750)) {

		spec->supported_bands |= SUPPORT_BAND_5GHZ;

		spec->num_channels = ARRAY_SIZE(rf_vals);

		spec->channels = rf_vals;

drivers/net/wireless/rt2x00/rt2800usb.c

+12 −7
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static const struct rf_channel rf_vals_3070[] = { 


static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

{

	struct rt2x00_chip *chip = &rt2x00dev->chip;

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	struct channel_info *info;

	char *tx_power1;
@@ -785,7 +786,10 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HW_SIGNAL_DBM |

	    IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_PS_NULLFUNC_STACK;

	rt2x00dev->hw->extra_tx_headroom = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;



	if (rt2x00_intf_is_usb(rt2x00dev))

		rt2x00dev->hw->extra_tx_headroom =

			TXINFO_DESC_SIZE + TXWI_DESC_SIZE;



	SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);

	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -800,17 +804,18 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	spec->supported_bands = SUPPORT_BAND_2GHZ;

	spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;



	if (rt2x00_rf(&rt2x00dev->chip, RF2820) ||

	    rt2x00_rf(&rt2x00dev->chip, RF2720)) {

	if (rt2x00_rf(chip, RF2820) ||

	    rt2x00_rf(chip, RF2720)) {

		spec->num_channels = 14;

		spec->channels = rf_vals;

	} else if (rt2x00_rf(&rt2x00dev->chip, RF2850) ||

		   rt2x00_rf(&rt2x00dev->chip, RF2750)) {

	} else if (rt2x00_rf(chip, RF2850) ||

		   rt2x00_rf(chip, RF2750)) {

		spec->supported_bands |= SUPPORT_BAND_5GHZ;

		spec->num_channels = ARRAY_SIZE(rf_vals);

		spec->channels = rf_vals;

	} else if (rt2x00_rf(&rt2x00dev->chip, RF3020) ||

		   rt2x00_rf(&rt2x00dev->chip, RF2020)) {

	} else if (rt2x00_intf_is_usb(rt2x00dev) &&

		    (rt2x00_rf(chip, RF3020) ||

		     rt2x00_rf(chip, RF2020))) {

		spec->num_channels = ARRAY_SIZE(rf_vals_3070);

		spec->channels = rf_vals_3070;

	}