netlink: Fix shadow warning on jiffies

[linux-2.6-block.git] / include / net / netlink.h

diff --git a/include/net/netlink.h b/include/net/netlink.h
index 2b47eaadba8fad95b9bde8aeeace37fa03d1fc31..6c1076275aaa687985674e84c310ed472cb8fd0d 100644 (file)
--- 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);
 }