Commit 27f09717 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2015-01-15' of... 

Merge tag 'mac80211-next-for-davem-2015-01-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Here's a big pile of changes for this round.

We have
 * a lot of regulatory code changes to deal with the
   way newer Intel devices handle this
 * a change to drop packets while disconnecting from
   an AP instead of trying to wait for them
 * a new attempt at improving the tailroom accounting
   to not kick in too much for performance reasons
 * improvements in wireless link statistics
 * many other small improvements and small fixes that
   didn't seem necessary for 3.19 (e.g. in hwsim which
   is testing only code)

Conflicts:
	drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

Minor overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 615612dc baf1b99b

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ 
!Finclude/net/cfg80211.h cfg80211_beacon_data

!Finclude/net/cfg80211.h cfg80211_ap_settings

!Finclude/net/cfg80211.h station_parameters

!Finclude/net/cfg80211.h station_info_flags

!Finclude/net/cfg80211.h rate_info_flags

!Finclude/net/cfg80211.h rate_info

!Finclude/net/cfg80211.h station_info

Documentation/kernel-parameters.txt

+12 −0
Original line number Diff line number Diff line
@@ -3206,6 +3206,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	retain_initrd	[RAM] Keep initrd memory after extraction



	rfkill.default_state=

		0	"airplane mode".  All wifi, bluetooth, wimax, gps, fm,

			etc. communication is blocked by default.

		1	Unblocked.



	rfkill.master_switch_mode=

		0	The "airplane mode" button does nothing.

		1	The "airplane mode" button toggles between everything

			blocked and the previous configuration.

		2	The "airplane mode" button toggles between everything

			blocked and everything unblocked.



	rhash_entries=	[KNL,NET]

			Set number of hash buckets for route cache

Documentation/rfkill.txt

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ whether they can be changed or not: 
 - soft block: writable radio block (need not be readable) that is set by

               the system software.



The rfkill subsystem has two parameters, rfkill.default_state and

rfkill.master_switch_mode, which are documented in kernel-parameters.txt.





2. Implementation details

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -2871,6 +2871,8 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
	int bit;

	u32 vdev_param;



	vif->driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;



	mutex_lock(&ar->conf_mutex);



	memset(arvif, 0, sizeof(*arvif));
@@ -5024,7 +5026,6 @@ int ath10k_mac_register(struct ath10k *ar) 
	ar->hw->flags = IEEE80211_HW_SIGNAL_DBM |

			IEEE80211_HW_SUPPORTS_PS |

			IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

			IEEE80211_HW_SUPPORTS_UAPSD |

			IEEE80211_HW_MFP_CAPABLE |

			IEEE80211_HW_REPORTS_TX_ACK_STATUS |

			IEEE80211_HW_HAS_RATE_CONTROL |

drivers/net/wireless/ath/ath10k/wmi.c

+4 −4
Original line number Diff line number Diff line
@@ -1344,11 +1344,11 @@ static void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb) 
		rx_clear_count -= ar->survey_last_rx_clear_count;



		survey = &ar->survey[idx];

		survey->channel_time = WMI_CHAN_INFO_MSEC(cycle_count);

		survey->channel_time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);

		survey->time = WMI_CHAN_INFO_MSEC(cycle_count);

		survey->time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);

		survey->noise = noise_floor;

		survey->filled = SURVEY_INFO_CHANNEL_TIME |

				 SURVEY_INFO_CHANNEL_TIME_RX |

		survey->filled = SURVEY_INFO_TIME |

				 SURVEY_INFO_TIME_RX |

				 SURVEY_INFO_NOISE_DBM;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE