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

Commit e5c407f9 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: N-PHY: store info about current channel's type 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a656b6a9

drivers/net/wireless/b43/phy_common.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define LINUX_B43_PHY_COMMON_H_

#define LINUX_B43_PHY_COMMON_H_





#include <linux/types.h>

#include <linux/types.h>

#include <linux/nl80211.h>





struct b43_wldev;

struct b43_wldev;
@@ -250,8 +251,9 @@ struct b43_phy { 
	 * check is needed. */

	 * check is needed. */

	unsigned long next_txpwr_check_time;

	unsigned long next_txpwr_check_time;





	/* current channel */

	/* Current channel */

	unsigned int channel;

	unsigned int channel;

	enum nl80211_channel_type channel_type;





	/* PHY TX errors counter. */

	/* PHY TX errors counter. */

	atomic_t txerr_cnt;

	atomic_t txerr_cnt;

drivers/net/wireless/b43/phy_n.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -74,6 +74,13 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, 
static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,

static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,

						u16 value, u8 core);

						u16 value, u8 core);





static inline bool b43_channel_type_is_40mhz(

					enum nl80211_channel_type channel_type)

{

	return (channel_type == NL80211_CHAN_HT40MINUS ||

		channel_type == NL80211_CHAN_HT40PLUS);

}



static inline bool b43_empty_chanspec(struct b43_chanspec *chanspec)

static inline bool b43_empty_chanspec(struct b43_chanspec *chanspec)

{

{

	return !chanspec->channel && !chanspec->sideband &&

	return !chanspec->channel && !chanspec->sideband &&
@@ -3404,10 +3411,9 @@ static int b43_nphy_set_channel(struct b43_wldev *dev, 




	nphy->radio_chanspec.channel = channel->hw_value;

	nphy->radio_chanspec.channel = channel->hw_value;





	/*

	if (b43_channel_type_is_40mhz(phy->channel_type) !=

	if (chanspec.b_width != nphy->b_width)

		b43_channel_type_is_40mhz(channel_type))

		; TODO: BMAC BW Set (chanspec.b_width)

		; /* TODO: BMAC BW Set (channel_type) */

	*/





	if (channel_type == NL80211_CHAN_HT40PLUS)

	if (channel_type == NL80211_CHAN_HT40PLUS)

		b43_phy_set(dev, B43_NPHY_RXCTL,

		b43_phy_set(dev, B43_NPHY_RXCTL,

drivers/net/wireless/b43/phy_n.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -984,7 +984,6 @@ struct b43_phy_n { 
	u16 papd_epsilon_offset[2];

	u16 papd_epsilon_offset[2];

	s32 preamble_override;

	s32 preamble_override;

	u32 bb_mult_save;

	u32 bb_mult_save;

	u8 b_width;

	struct b43_chanspec radio_chanspec;

	struct b43_chanspec radio_chanspec;





	bool gain_boost;

	bool gain_boost;