]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
netlink: Fix shadow warning on jiffies
authorMark Rustad <mark.d.rustad@intel.com>
Fri, 25 Jul 2014 09:18:17 +0000 (02:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jul 2014 00:20:43 +0000 (17:20 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netlink.h

index 2b47eaadba8fad95b9bde8aeeace37fa03d1fc31..6c1076275aaa687985674e84c310ed472cb8fd0d 100644 (file)
@@ -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);
 }