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

Commit cb23832e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
  decnet: Fix compiler warning in dn_dev.c
  IPV6: Fix default gateway criteria wrt. HIGH/LOW preference radv option
  net/802/fc.c: Fix compilation warnings
  netns: correct mib stats in ip6_route_me_harder()
  netns: fix net_generic array leak
  rt2x00: fix regression introduced by "mac80211: free up 2 bytes in skb->cb"
  rtl8187: Add USB ID for Belkin F5D7050 with RTL8187B chip
  p54usb: Device ID updates
  mac80211: fixme for kernel-doc
  ath9k/mac80211: disallow fragmentation in ath9k, report to userspace
  libertas : Remove unused variable warning for "old_channel" from cmd.c
  mac80211: Fix scan RX processing oops
  orinoco: fix unsafe locking in spectrum_cs_suspend
  orinoco: fix unsafe locking in orinoco_cs_resume
  cfg80211: fix debugfs error handling
  mac80211: fix debugfs netdev rename
  iwlwifi: fix ct kill configuration for 5350
  mac80211: fix HT information element parsing
  p54: Fix compilation problem on PPC
  mac80211: fix debugfs lockup
  ...
parents 8ef50901 8fa0b315

Documentation/networking/phonet.txt

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ WARNING: 
When polling a connected pipe socket for writability, there is an

intrinsic race condition whereby writability might be lost between the

polling and the writing system calls. In this case, the socket will

block until write because possible again, unless non-blocking mode

becomes enabled.

block until write becomes possible again, unless non-blocking mode

is enabled.





The pipe protocol provides two socket options at the SOL_PNPIPE level:

drivers/net/wireless/ath9k/main.c

+7 −1
Original line number Diff line number Diff line
@@ -1640,6 +1640,11 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, 
	return ret;

}



static int ath9k_no_fragmentation(struct ieee80211_hw *hw, u32 value)

{

	return -EOPNOTSUPP;

}



static struct ieee80211_ops ath9k_ops = {

	.tx 		    = ath9k_tx,

	.start 		    = ath9k_start,
@@ -1664,7 +1669,8 @@ static struct ieee80211_ops ath9k_ops = { 
	.get_tsf 	    = ath9k_get_tsf,

	.reset_tsf 	    = ath9k_reset_tsf,

	.tx_last_beacon     = NULL,

	.ampdu_action       = ath9k_ampdu_action

	.ampdu_action       = ath9k_ampdu_action,

	.set_frag_threshold = ath9k_no_fragmentation,

};



static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

drivers/net/wireless/iwlwifi/iwl-5000.c

+3 −3
Original line number Diff line number Diff line
@@ -833,12 +833,12 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
	switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {

	case CSR_HW_REV_TYPE_5100:

	case CSR_HW_REV_TYPE_5300:

		/* 5X00 wants in Celsius */

	case CSR_HW_REV_TYPE_5350:

		/* 5X00 and 5350 wants in Celsius */

		priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;

		break;

	case CSR_HW_REV_TYPE_5150:

	case CSR_HW_REV_TYPE_5350:

		/* 5X50 wants in Kelvin */

		/* 5150 wants in Kelvin */

		priv->hw_params.ct_kill_threshold =

				CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD);

		break;

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, 
			void *priv_sta)

{

	struct iwl_lq_sta *lq_sta = priv_sta;

	struct iwl_priv *priv = priv_r;

	struct iwl_priv *priv __maybe_unused = priv_r;



	IWL_DEBUG_RATE("enter\n");

	kfree(lq_sta);

drivers/net/wireless/libertas/cmd.c

+2 −0
Original line number Diff line number Diff line
@@ -823,7 +823,9 @@ int lbs_update_channel(struct lbs_private *priv) 
int lbs_set_channel(struct lbs_private *priv, u8 channel)

{

	struct cmd_ds_802_11_rf_channel cmd;

#ifdef DEBUG

	u8 old_channel = priv->curbssparams.channel;

#endif

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);