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

Commit 2861a185 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of... 

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3956,6 +3956,7 @@ F: net/rfkill/ 
F:	net/wireless/

F:	include/net/ieee80211*

F:	include/linux/wireless.h

F:	include/linux/iw_handler.h

F:	drivers/net/wireless/



NETWORKING DRIVERS

drivers/net/wireless/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ config LIBERTAS_THINFIRM 
	---help---

	  A library for Marvell Libertas 8xxx devices using thinfirm.



config LIBERTAS_THINFIRM_DEBUG

	bool "Enable full debugging output in the Libertas thin firmware module."

	depends on LIBERTAS_THINFIRM

	---help---

	  Debugging support.



config LIBERTAS_THINFIRM_USB

	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"

	depends on LIBERTAS_THINFIRM && USB

drivers/net/wireless/at76c50x-usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,7 @@ static void at76_dwork_hw_scan(struct work_struct *work) 
}



static int at76_hw_scan(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif,

			struct cfg80211_scan_request *req)

{

	struct at76_priv *priv = hw->priv;

drivers/net/wireless/ath/ar9170/main.c

+1 −3
Original line number Diff line number Diff line
@@ -927,7 +927,6 @@ static void ar9170_rx_phy_status(struct ar9170 *ar, 


	/* TODO: we could do something with phy_errors */

	status->signal = ar->noise[0] + phy->rssi_combined;

	status->noise = ar->noise[0];

}



static struct sk_buff *ar9170_rx_copy_data(u8 *buf, int len)
@@ -2548,8 +2547,7 @@ void *ar9170_alloc(size_t priv_size) 
					 BIT(NL80211_IFTYPE_ADHOC);

	ar->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS |

			 IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

			 IEEE80211_HW_SIGNAL_DBM |

			 IEEE80211_HW_NOISE_DBM;

			 IEEE80211_HW_SIGNAL_DBM;



	if (modparam_ht) {

		ar->hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;

drivers/net/wireless/ath/ath5k/base.c

+2 −4
Original line number Diff line number Diff line
@@ -548,8 +548,7 @@ ath5k_pci_probe(struct pci_dev *pdev, 
	SET_IEEE80211_DEV(hw, &pdev->dev);

	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |

		    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

		    IEEE80211_HW_SIGNAL_DBM |

		    IEEE80211_HW_NOISE_DBM;

		    IEEE80211_HW_SIGNAL_DBM;



	hw->wiphy->interface_modes =

		BIT(NL80211_IFTYPE_AP) |
@@ -2030,8 +2029,7 @@ accept: 
		rxs->freq = sc->curchan->center_freq;

		rxs->band = sc->curband->band;



		rxs->noise = sc->ah->ah_noise_floor;

		rxs->signal = rxs->noise + rs.rs_rssi;

		rxs->signal = sc->ah->ah_noise_floor + rs.rs_rssi;



		rxs->antenna = rs.rs_antenna;