Skip to contentSkip to conversation

b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function

PATCH New Rafał Miłecki 3 participants 4 messages Aug 22, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function

---
Gábor: please kindly, watch out for such a missing calls/sets. We may lose a lot of time looking for such a missing lines later.

---
 drivers/net/wireless/b43/phy_n.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_n.c +3 -1
index d116229..2466c0a 100644
@@ -3092,6 +3092,8 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 	struct b43_phy_n *nphy = phy->n;
 	u16 buf[16];
 
+	nphy->phyrxchain = mask;
+
 	if (0 /* FIXME clk */)
 		return;
 
@@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
 			(mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
 
-	if (mask & 0x3 != 0x3) {
+	if ((mask & 0x3) != 0x3) {
 		b43_phy_write(dev, B43_NPHY_HPANT_SWTHRES, 1);
 		if (dev->phy.rev >= 3) {
 			/* TODO */
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function

2010/8/22 Rafa? Mi?ecki <[email protected]>:

Quoted 22 lines

---
G?bor: please kindly, watch out for such a missing calls/sets. We may lose a lot of time looking for such a missing lines later.
---
?drivers/net/wireless/b43/phy_n.c | ? ?4 +++-
?1 files changed, 3 insertions(+), 1 deletions(-)

drivers/net/wireless/b43/phy_n.c +2 -0
index d116229..2466c0a 100644
@@ -3092,6 +3092,8 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 ? ? ? ?struct b43_phy_n *nphy = phy->n;
 ? ? ? ?u16 buf[16];
 
+ ? ? ? nphy->phyrxchain = mask;
+
 ? ? ? ?if (0 /* FIXME clk */)
 ? ? ? ? ? ? ? ?return;
 

drivers/net/wireless/b43/phy_n.c static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) · line 3108

Quoted 5 lines
drivers/net/wireless/b43/phy_n.c +1 -1
@@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 ? ? ? ?b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
 ? ? ? ? ? ? ? ? ? ? ? ?(mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
 
- ? ? ? if (mask & 0x3 != 0x3) {
+ ? ? ? if ((mask & 0x3) != 0x3) {

Why is this needed? An & doesn't magically transform into an && under any circumstances...

Quoted 7 lines
drivers/net/wireless/b43/phy_n.c +0 -0
 ? ? ? ? ? ? ? ?b43_phy_write(dev, B43_NPHY_HPANT_SWTHRES, 1);
 ? ? ? ? ? ? ? ?if (dev->phy.rev >= 3) {

? ? ? ? ? ? ? ? ? ? ? ?/* TODO */
--
1.7.1

Signature · 1 line
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
#2 lore raw

PATCH 1/1 b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function

W dniu 22 sierpnia 2010 21:49 u?ytkownik G?bor Stefanik <[email protected]> napisa?:

Quoted 26 lines

2010/8/22 Rafa? Mi?ecki <[email protected]>:

Quoted 25 lines

---
G?bor: please kindly, watch out for such a missing calls/sets. We may lose a lot of time looking for such a missing lines later.
---
?drivers/net/wireless/b43/phy_n.c | ? ?4 +++-
?1 files changed, 3 insertions(+), 1 deletions(-)

drivers/net/wireless/b43/phy_n.c +2 -0
index d116229..2466c0a 100644
@@ -3092,6 +3092,8 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 ? ? ? ?struct b43_phy_n *nphy = phy->n;
 ? ? ? ?u16 buf[16];
 
+ ? ? ? nphy->phyrxchain = mask;
+
 ? ? ? ?if (0 /* FIXME clk */)
 ? ? ? ? ? ? ? ?return;
 
@@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 ? ? ? ?b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
 ? ? ? ? ? ? ? ? ? ? ? ?(mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
 
Quoted 5 lines

drivers/net/wireless/b43/phy_n.c static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) · line 3108

Quoted 2 lines
drivers/net/wireless/b43/phy_n.c +1 -1
- ? ? ? if (mask & 0x3 != 0x3) {
+ ? ? ? if ((mask & 0x3) != 0x3) {

Why is this needed? An & doesn't magically transform into an && under any circumstances...

I agree it's quite obvious, however I believe kernel compiles with flags raising such a warnings by default:

drivers/net/wireless/b43/phy_n.c: In function ?b43_nphy_set_rx_core_state?:
drivers/net/wireless/b43/phy_n.c:3106:2: warning: suggest parentheses around comparison in operand of ?&?

Signature · 1 line
Rafa?
#3 lore raw
In reply to Gábor Stefanik
Quoted 10 lines · Gábor Stefanik

2010/8/22 Rafał Miłecki <[email protected]>:

drivers/net/wireless/b43/phy_n.c static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) · line 3108

Quoted 6 lines
drivers/net/wireless/b43/phy_n.c +1 -1
@@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
       b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
                       (mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
 
-       if (mask & 0x3 != 0x3) {
+       if ((mask & 0x3) != 0x3) {

Why is this needed? An & doesn't magically transform into an && under any circumstances...

For the same reason it's used in the b43_phy_maskset call. Clarity.