2014-07-11 19:02:48

by Malcolm Priestley

Subject: [PATCH 1/2] staging: vt6656: vnt_init_bands fix missing default.

The default is that all the channels are enabled for rf types
not mentioned here.

Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/channel.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index 5202633..fb1838e 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -148,6 +148,7 @@ void vnt_init_bands(struct vnt_private *priv)
switch (priv->byRFType) {
case RF_AIROHA7230:
case RF_VT3342A0:
+ default:
ch = vnt_channels_5ghz;

for (i = 0; i < ARRAY_SIZE(vnt_channels_5ghz); i++) {
--
1.9.1

2014-07-11 19:02:50

by Malcolm Priestley

Subject: [PATCH 2/2] staging: vt6656: Fix pairwise key for non station modes

patch 'vnt_set_keymode don't save pairwise key entry' caused
a slight regression in access point mode

Only don't save in station mode.

Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/key.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 7275f09..b76ee31 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -98,8 +98,9 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
case VNT_KEY_PAIRWISE:
key_mode |= mode;
key_inx = 4;
- /* Don't save entry for pairwise key */
- clear_bit(entry, &priv->key_entry_inuse);
+ /* Don't save entry for pairwise key for station mode */
+ if (priv->op_mode == NL80211_IFTYPE_STATION)
+ clear_bit(entry, &priv->key_entry_inuse);
break;
default:
return -EINVAL;
--
1.9.1