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

Commit 3549c6b1 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 



Fixed-up drivers/net/wireless/iwlwifi/mvm/mac80211.c to change change
IEEE80211_HW_NEED_DTIM_PERIOD to IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC
as requested by Johannes Berg. -- JWL

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents b26f5f09 3f52b7e3

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

+1 −1
Original line number Diff line number Diff line
@@ -1853,7 +1853,7 @@ void *carl9170_alloc(size_t priv_size) 
		     IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		     IEEE80211_HW_SUPPORTS_PS |

		     IEEE80211_HW_PS_NULLFUNC_STACK |

		     IEEE80211_HW_NEED_DTIM_PERIOD |

		     IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		     IEEE80211_HW_SIGNAL_DBM;



	if (!modparam_noht) {

drivers/net/wireless/iwlegacy/4965-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -5733,7 +5733,7 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length) 
	/* Tell mac80211 our characteristics */

	hw->flags =

	    IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |

	    IEEE80211_HW_NEED_DTIM_PERIOD | IEEE80211_HW_SPECTRUM_MGMT |

	    IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SPECTRUM_MGMT |

	    IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_SUPPORTS_DYNAMIC_PS;

	if (il->cfg->sku & IL_SKU_N)

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
	/* Tell mac80211 our characteristics */

	hw->flags = IEEE80211_HW_SIGNAL_DBM |

		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_NEED_DTIM_PERIOD |

		    IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		    IEEE80211_HW_SPECTRUM_MGMT |

		    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		    IEEE80211_HW_QUEUE_CONTROL |

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_SCAN_WHILE_IDLE |

		    IEEE80211_HW_NEED_DTIM_PERIOD |

		    IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_AMPDU_AGGREGATION;

include/linux/ieee80211.h

+8 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ 
/* Mesh Control 802.11s */

#define IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT  0x0100



/* Mesh Power Save Level */

#define IEEE80211_QOS_CTL_MESH_PS_LEVEL		0x0200

/* Mesh Receiver Service Period Initiated */

#define IEEE80211_QOS_CTL_RSPI			0x0400



/* U-APSD queue for WMM IEs sent by AP */

#define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD	(1<<7)

#define IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK	0x0f
@@ -675,11 +680,14 @@ struct ieee80211_meshconf_ie { 
 * @IEEE80211_MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs

 * @IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure

 *	is ongoing

 * @IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL: STA is in deep sleep mode or has

 *	neighbors in deep sleep mode

 */

enum mesh_config_capab_flags {

	IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS		= 0x01,

	IEEE80211_MESHCONF_CAPAB_FORWARDING		= 0x08,

	IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING		= 0x20,

	IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL	= 0x40,

};



/**