Search Linux Wireless

Re: [PATCH 1/6] staging: vt6655: set_channel replace parameter with ieee80211_channel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 04/12/14 22:12, Malcolm Priestley wrote:
replacing uConnectionChannel for hw_value as set in vnt_init_bands.

This allows other signaling of ieee80211_channel to move deeper into
driver.

Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
---
Hi greg

Can you drop this patch series altogether.

I will repost these later after some needed bug fixes for 3.19


Malcolm

  drivers/staging/vt6655/channel.c     | 12 ++++++------
  drivers/staging/vt6655/channel.h     |  2 +-
  drivers/staging/vt6655/device_main.c |  2 +-
  3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index c8f739d..6514869 100644
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -174,12 +174,12 @@ void vnt_init_bands(struct vnt_private *priv)
   * Return Value: true if succeeded; false if failed.
   *
   */
-bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
+bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch)
  {
  	struct vnt_private *pDevice = pDeviceHandler;
  	bool bResult = true;

-	if (pDevice->byCurrentCh == uConnectionChannel)
+	if (pDevice->byCurrentCh == ch->hw_value)
  		return bResult;

  	/* clear NAV */
@@ -189,15 +189,15 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)

  	if (pDevice->byRFType == RF_AIROHA7230)
  		RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh,
-						  (unsigned char)uConnectionChannel);
+						  (unsigned char)ch->hw_value);

-	pDevice->byCurrentCh = (unsigned char)uConnectionChannel;
+	pDevice->byCurrentCh = (unsigned char)ch->hw_value;
  	bResult &= RFbSelectChannel(pDevice, pDevice->byRFType,
-				    (unsigned char)uConnectionChannel);
+				    (unsigned char)ch->hw_value);

  	/* Init Synthesizer Table */
  	if (pDevice->bEnablePSMode)
-		RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, uConnectionChannel);
+		RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, ch->hw_value);

  	BBvSoftwareReset(pDevice);

diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h
index 4f4264e..e2be6fc 100644
--- a/drivers/staging/vt6655/channel.h
+++ b/drivers/staging/vt6655/channel.h
@@ -27,6 +27,6 @@

  void vnt_init_bands(struct vnt_private *);

-bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel);
+bool set_channel(void *pDeviceHandler, struct ieee80211_channel *);

  #endif /* _CHANNEL_H_ */
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 83e4162..b50c4f2 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1415,7 +1415,7 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed)

  	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) ||
  	    (conf->flags & IEEE80211_CONF_OFFCHANNEL)) {
-		set_channel(priv, conf->chandef.chan->hw_value);
+		set_channel(priv, conf->chandef.chan);

  		if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
  			bb_type = BB_TYPE_11A;

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux