* [net-next] netlink: Fix shadow warning on jiffies
@ 2014-07-25 9:18 Jeff Kirsher
2014-07-29 0:20 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2014-07-25 9:18 UTC (permalink / raw)
To: davem; +Cc: Mark Rustad, netdev, nhorman, sassmann, Jeff Kirsher
From: Mark Rustad <mark.d.rustad@intel.com>
Change formal parameter name to not shadow the global jiffies.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
include/net/netlink.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 2b47eaa..6c10762 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -949,12 +949,12 @@ static inline int nla_put_flag(struct sk_buff *skb, int attrtype)
* nla_put_msecs - Add a msecs netlink attribute to a socket buffer
* @skb: socket buffer to add attribute to
* @attrtype: attribute type
- * @jiffies: number of msecs in jiffies
+ * @njiffies: number of jiffies to convert to msecs
*/
static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
- unsigned long jiffies)
+ unsigned long njiffies)
{
- u64 tmp = jiffies_to_msecs(jiffies);
+ u64 tmp = jiffies_to_msecs(njiffies);
return nla_put(skb, attrtype, sizeof(u64), &tmp);
}
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net-next] netlink: Fix shadow warning on jiffies
2014-07-25 9:18 [net-next] netlink: Fix shadow warning on jiffies Jeff Kirsher
@ 2014-07-29 0:20 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-07-29 0:20 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: mark.d.rustad, netdev, nhorman, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 25 Jul 2014 02:18:17 -0700
> From: Mark Rustad <mark.d.rustad@intel.com>
>
> Change formal parameter name to not shadow the global jiffies.
>
> Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-29 0:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25 9:18 [net-next] netlink: Fix shadow warning on jiffies Jeff Kirsher
2014-07-29 0:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).