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

Commit 2db125d4 authored Jun 27, 2016 by Jes Sorensen Committed by Kalle Valo Jul 08, 2016

rtl8xxxu: Obtain ieee80211_rx_status within parse_rx_desc()



When handling aggregated packets, we'll get a new ieee80211_rx_status
for each cloned skb, so passing in the pointer from the outside
doesn't make sense.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent a635df8a

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+3 −6

Original line number	Diff line number	Diff line
		@@ -1315,8 +1315,7 @@ struct rtl8xxxu_fileops {
		void (phy_init_antenna_selection) (struct rtl8xxxu_priv priv);
		void (phy_iq_calibrate) (struct rtl8xxxu_priv priv);
		void (config_channel) (struct ieee80211_hw hw);
		int (parse_rx_desc) (struct rtl8xxxu_priv priv, struct sk_buff *skb,
		struct ieee80211_rx_status *rx_status);
		int (parse_rx_desc) (struct rtl8xxxu_priv priv, struct sk_buff *skb);
		void (init_aggregation) (struct rtl8xxxu_priv priv);
		void (init_statistics) (struct rtl8xxxu_priv priv);
		void (enable_rf) (struct rtl8xxxu_priv priv);
		@@ -1412,10 +1411,8 @@ void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv,
		void rtl8xxxu_gen1_enable_rf(struct rtl8xxxu_priv *priv);
		void rtl8xxxu_gen1_disable_rf(struct rtl8xxxu_priv *priv);
		void rtl8xxxu_gen2_disable_rf(struct rtl8xxxu_priv *priv);
		int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb,
		struct ieee80211_rx_status *rx_status);
		int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb,
		struct ieee80211_rx_status *rx_status);
		int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb);
		int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb);
		int rtl8xxxu_gen2_channel_to_group(int channel);
		bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv,
		int result[][8], int c1, int c2);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -5090,10 +5090,10 @@ static void rtl8723bu_handle_c2h(struct rtl8xxxu_priv *priv,
		}
		}

		int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb,
		struct ieee80211_rx_status *rx_status)
		int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb)
		{
		struct ieee80211_hw *hw = priv->hw;
		struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
		struct rtl8xxxu_rxdesc16 *rx_desc =
		(struct rtl8xxxu_rxdesc16 *)skb->data;
		struct rtl8723au_phy_stats *phy_stats;
		@@ -5143,10 +5143,10 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb,
		return RX_TYPE_DATA_PKT;
		}

		int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb,
		struct ieee80211_rx_status *rx_status)
		int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb)
		{
		struct ieee80211_hw *hw = priv->hw;
		struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
		struct rtl8xxxu_rxdesc24 *rx_desc =
		(struct rtl8xxxu_rxdesc24 *)skb->data;
		struct rtl8723au_phy_stats *phy_stats;
		@@ -5211,13 +5211,12 @@ static void rtl8xxxu_rx_complete(struct urb *urb)
		struct ieee80211_hw *hw = rx_urb->hw;
		struct rtl8xxxu_priv *priv = hw->priv;
		struct sk_buff skb = (struct sk_buff )urb->context;
		struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
		struct device *dev = &priv->udev->dev;

		skb_put(skb, urb->actual_length);

		if (urb->status == 0) {
		priv->fops->parse_rx_desc(priv, skb, rx_status);
		priv->fops->parse_rx_desc(priv, skb);

		skb = NULL;
		rx_urb->urb.context = NULL;