Skip to contentSkip to conversation

ixgbe: missing parentheses

PATCH Andrew Morton 3 participants 4 messages Apr 16, 2009 1 message not in the archive

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Andrew Morton

author
#1 lore raw

(cc netdev)

Quoted 9 lines · On Thu, 16 Apr 2009 23:05:00 +0200 Roel Kluin <[email protected]> wrote:

!' has a higher precedence than &'

Signed-off-by Roel Kluin <[email protected]>

---

drivers/net/ixgbe/ixgbe_main.c +0 -0
index febde45..49a9037 100644

drivers/net/ixgbe/ixgbe_main.c static void ixgbe_sfp_config_module_task(struct work_struct *work) · line 3952

Quoted 8 lines
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -3946,7 +3946,7 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
 	}
 	hw->mac.ops.setup_sfp(hw);
 
-	if (!adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK)
+	if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
 		/* This will also work for DA Twinax connections */
 		schedule_work(&adapter->multispeed_fiber_task);
 	adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK;

This is fixed in linux-next, but hasn't been pushed to Linus yet.

#2 lore raw
Quoted 20 lines · On Thursday, April 16, 2009 Andrew Morton wrote:

(cc netdev)

drivers/net/ixgbe/ixgbe_main.c static void ixgbe_sfp_config_module_task(struct

Quoted 9 lines · On Thu, 16 Apr 2009 23:05:00 +0200 Roel Kluin <[email protected]> wrote:

!' has a higher precedence than &'

Signed-off-by Roel Kluin <[email protected]>

---

drivers/net/ixgbe/ixgbe_main.c +0 -0
index febde45..49a9037 100644
@@ -3946,7 +3946,7 @@ static void ixgbe_sfp_config_module_task(struct

work_struct *work)

Quoted 3 lines
drivers/net/ixgbe/ixgbe_main.c +0 -0
 	}
 	hw->mac.ops.setup_sfp(hw);
Quoted 7 lines

drivers/net/ixgbe/ixgbe_main.c static void ixgbe_sfp_config_module_task(struct · line 3952

Quoted 5 lines
drivers/net/ixgbe/ixgbe_main.c +1 -1
-	if (!adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK)
+	if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
 		/* This will also work for DA Twinax connections */
 		schedule_work(&adapter->multispeed_fiber_task);
 	adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK;

This is fixed in linux-next, but hasn't been pushed to Linus yet.

Yes, Dave has this fix in his net-next-2.6 tree.

Dave - Can we pull this fix into net-2.6?

Cheers,
Jeff

maintainer
#3 lore raw

From: "Kirsher, Jeffrey T" <[email protected]>
Date: Thu, 16 Apr 2009 14:25:44 -0700

Quoted 1 line

Dave - Can we pull this fix into net-2.6?

Just toss me a patch and I'll apply it directly.

maintainer
#4 lore raw
In reply to Andrew Morton

From: Andrew Morton <[email protected]>
Date: Thu, 16 Apr 2009 14:16:10 -0700

Quoted 11 lines

Review static void ixgbe_sfp_config_module_task(struct work_struct *work) · line 3952

Quoted 9 lines
(quoted diff) +1 -1
@@ -3946,7 +3946,7 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
 	}
 	hw->mac.ops.setup_sfp(hw);
 
-	if (!adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK)
+	if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
 		/* This will also work for DA Twinax connections */
 		schedule_work(&adapter->multispeed_fiber_task);
 	adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK;

This is fixed in linux-next, but hasn't been pushed to Linus yet.

If I recall correctly, this got submitted to me as a net-next-2.6 only patch, which obviously isn't correct.

Intel folks, please resubmit this to me for net-2.6 too, thanks.

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p