diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2014-07-25 02:18:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-28 17:20:43 -0700 |
| commit | d87de1f3e9635b16345bde54306c949417b689ad (patch) | |
| tree | 14d54b38ea9d2a7ec9984fcdc90a8d8e1563beb6 /include/net/netlink.h | |
| parent | f1b714bbe3bc20920ab7cd17d60b23d2855b645d (diff) | |
| download | linux-d87de1f3e9635b16345bde54306c949417b689ad.tar.bz2 | |
netlink: Fix shadow warning on jiffies
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>
Diffstat (limited to 'include/net/netlink.h')
| -rw-r--r-- | include/net/netlink.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index 2b47eaadba8f..6c1076275aaa 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); } |