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

Commit 8b30b1fe authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

mac80211: Re-enable aggregation 



Wireless HW without any dedicated queues for aggregation
do not need the ampdu_queues mechanism present right now
in mac80211. Since mac80211 is still incomplete wrt TX MQ
changes, do not allow aggregation sessions for drivers that
set ampdu_queues.

This is only an interim hack until Intel fixes the requeue issue.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarLuis Rodriguez <Luis.Rodriguez@Atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4393dce9

drivers/net/wireless/ath9k/main.c

+2 −4
Original line number Diff line number Diff line
@@ -953,10 +953,7 @@ static int ath_attach(u16 devid, 
			&sc->sbands[IEEE80211_BAND_5GHZ];

	}



	/* FIXME: Have to figure out proper hw init values later */



	hw->queues = 4;

	hw->ampdu_queues = 1;



	/* Register rate control */

	hw->rate_control_algorithm = "ath9k_rate_control";
@@ -1745,7 +1742,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |

		IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

		IEEE80211_HW_SIGNAL_DBM |

		IEEE80211_HW_NOISE_DBM;

		IEEE80211_HW_NOISE_DBM |

		IEEE80211_HW_AMPDU_AGGREGATION;



	hw->wiphy->interface_modes =

		BIT(NL80211_IFTYPE_AP) |

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

+2 −1
Original line number Diff line number Diff line
@@ -871,7 +871,8 @@ int iwl_setup_mac(struct iwl_priv *priv) 


	/* Tell mac80211 our characteristics */

	hw->flags = IEEE80211_HW_SIGNAL_DBM |

		    IEEE80211_HW_NOISE_DBM;

		    IEEE80211_HW_NOISE_DBM |

		    IEEE80211_HW_AMPDU_AGGREGATION;

	hw->wiphy->interface_modes =

		BIT(NL80211_IFTYPE_AP) |

		BIT(NL80211_IFTYPE_STATION) |

include/linux/skbuff.h

+4 −0
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ typedef unsigned char *sk_buff_data_t; 
 *	@tc_verd: traffic control verdict

 *	@ndisc_nodetype: router type (from link layer)

 *	@do_not_encrypt: set to prevent encryption of this frame

 *	@requeue: set to indicate that the wireless core should attempt

 *		a software retry on this frame if we failed to

 *		receive an ACK for it

 *	@dma_cookie: a cookie to one of several possible DMA operations

 *		done by skb DMA functions

 *	@secmark: security marking
@@ -326,6 +329,7 @@ struct sk_buff { 
#endif

#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)

	__u8			do_not_encrypt:1;

	__u8			requeue:1;

#endif

	/* 0/13/14 bit hole */

include/net/mac80211.h

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ struct ieee80211_bss_conf { 
 * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be

 *	set by rate control algorithms to indicate probe rate, will

 *	be cleared for fragmented frames (except on the last fragment)

 * @IEEE80211_TX_CTL_REQUEUE: REMOVE THIS

 */

enum mac80211_tx_control_flags {

	IEEE80211_TX_CTL_REQ_TX_STATUS		= BIT(0),
@@ -258,9 +257,6 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_STAT_AMPDU			= BIT(10),

	IEEE80211_TX_STAT_AMPDU_NO_BACK		= BIT(11),

	IEEE80211_TX_CTL_RATE_CTRL_PROBE	= BIT(12),



	/* XXX: remove this */

	IEEE80211_TX_CTL_REQUEUE		= BIT(13),

};



enum mac80211_rate_control_flags {
@@ -847,6 +843,9 @@ enum ieee80211_tkip_key_type { 
 * @IEEE80211_HW_SPECTRUM_MGMT:

 * 	Hardware supports spectrum management defined in 802.11h

 * 	Measurement, Channel Switch, Quieting, TPC

 *

 * @IEEE80211_HW_AMPDU_AGGREGATION:

 *	Hardware supports 11n A-MPDU aggregation.

 */

enum ieee80211_hw_flags {

	IEEE80211_HW_RX_INCLUDES_FCS			= 1<<1,
@@ -858,6 +857,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_SIGNAL_DBM				= 1<<7,

	IEEE80211_HW_NOISE_DBM				= 1<<8,

	IEEE80211_HW_SPECTRUM_MGMT			= 1<<9,

	IEEE80211_HW_AMPDU_AGGREGATION			= 1<<10,

};



/**

net/core/skbuff.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) 
	C(truesize);

#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)

	C(do_not_encrypt);

	C(requeue);

#endif

	atomic_set(&n->users, 1);