From: Alexander Duyck <alexander.h.duyck@intel•com>
To: davem@davemloft•net, jeffrey.t.kirsher@intel•com,
bhutchings@solarflare•com
Cc: netdev@vger•kernel.org
Subject: [ethtool PATCH 3/4] Add support for __be64 and bitops, centralize several needed macros
Date: Tue, 03 May 2011 09:12:21 -0700 [thread overview]
Message-ID: <20110503161221.29251.5128.stgit@gitlad.jf.intel.com> (raw)
In-Reply-To: <20110503160547.29251.84333.stgit@gitlad.jf.intel.com>
This change is meant to add support for __be64 values and bitops to
ethtool. In addition the patch pulls the SIOCETHTOOL define and the
ARRAY_SIZE define into ethtool-util.h for later use by the rxclass files.
These changes will be needed in order to support network flow
classifier rule configuration.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel•com>
---
ethtool-bitops.h | 25 +++++++++++++++++++++++++
ethtool-util.h | 16 ++++++++++++++--
2 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 ethtool-bitops.h
diff --git a/ethtool-bitops.h b/ethtool-bitops.h
new file mode 100644
index 0000000..b1eb426
--- /dev/null
+++ b/ethtool-bitops.h
@@ -0,0 +1,25 @@
+#ifndef ETHTOOL_BITOPS_H__
+#define ETHTOOL_BITOPS_H__
+
+#define BITS_PER_BYTE 8
+#define BITS_PER_LONG (BITS_PER_BYTE * sizeof(long))
+#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
+#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG)
+
+static inline void set_bit(int nr, unsigned long *addr)
+{
+ addr[nr / BITS_PER_LONG] |= 1UL << (nr % BITS_PER_LONG);
+}
+
+static inline void clear_bit(int nr, unsigned long *addr)
+{
+ addr[nr / BITS_PER_LONG] &= ~(1UL << (nr % BITS_PER_LONG));
+}
+
+static inline int test_bit(unsigned int nr, const unsigned long *addr)
+{
+ return !!((1UL << (nr % BITS_PER_LONG)) &
+ (((unsigned long *)addr)[nr / BITS_PER_LONG]));
+}
+
+#endif
diff --git a/ethtool-util.h b/ethtool-util.h
index 6a4f3f4..d8b621c 100644
--- a/ethtool-util.h
+++ b/ethtool-util.h
@@ -15,6 +15,7 @@
#ifndef HAVE_BE_TYPES
typedef __uint16_t __be16;
typedef __uint32_t __be32;
+typedef unsigned long long __be64;
#endif
typedef unsigned long long u64;
@@ -28,11 +29,15 @@ typedef __int32_t s32;
#if __BYTE_ORDER == __BIG_ENDIAN
static inline u16 cpu_to_be16(u16 value)
{
- return value;
+ return value;
}
static inline u32 cpu_to_be32(u32 value)
{
- return value;
+ return value;
+}
+static inline u64 cpu_to_be64(u64 value)
+{
+ return value;
}
#else
static inline u16 cpu_to_be16(u16 value)
@@ -43,8 +48,15 @@ static inline u32 cpu_to_be32(u32 value)
{
return cpu_to_be16(value >> 16) | (cpu_to_be16(value) << 16);
}
+static inline u64 cpu_to_be64(u64 value)
+{
+ return cpu_to_be32(value >> 32) | ((u64)cpu_to_be32(value) << 32);
+}
#endif
+#define ntohll cpu_to_be64
+#define htonll cpu_to_be64
+
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif
next prev parent reply other threads:[~2011-05-03 16:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-03 16:12 [ethtool PATCH 0/4] Add support for network flow classifier Alexander Duyck
2011-05-03 16:12 ` [ethtool PATCH 1/4] ethtool: remove strings based approach for displaying n-tuple Alexander Duyck
2011-05-03 16:12 ` [ethtool PATCH 2/4] Cleanup defines and header includes to address several issues Alexander Duyck
2011-05-03 16:12 ` Alexander Duyck [this message]
2011-05-03 16:12 ` [ethtool PATCH 4/4] v5 Add RX packet classification interface Alexander Duyck
2011-05-03 23:23 ` Dimitris Michailidis
2011-05-03 23:34 ` Ben Hutchings
2011-05-04 0:29 ` Alexander Duyck
2011-05-04 1:35 ` Dimitris Michailidis
2011-05-04 3:10 ` Alexander Duyck
2011-05-04 17:09 ` Dimitris Michailidis
2011-05-04 17:24 ` Ben Hutchings
2011-05-04 17:33 ` Dimitris Michailidis
2011-05-04 17:41 ` Alexander Duyck
2011-05-04 18:05 ` Ben Hutchings
2011-05-04 18:21 ` Alexander Duyck
2011-05-04 18:45 ` Ben Hutchings
2011-05-04 21:07 ` Alexander Duyck
2011-05-04 21:54 ` Ben Hutchings
2011-05-04 19:06 ` Dimitris Michailidis
2011-05-04 18:18 ` Dimitris Michailidis
2011-05-04 18:35 ` Alexander Duyck
2011-05-04 18:50 ` Dimitris Michailidis
-- strict thread matches above, loose matches on Subject: below --
2011-05-04 18:41 [ethtool PATCH 0/4] v6 Add support for network flow classifier Alexander Duyck
2011-05-04 18:41 ` [ethtool PATCH 3/4] Add support for __be64 and bitops, centralize several needed macros Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110503161221.29251.5128.stgit@gitlad.jf.intel.com \
--to=alexander.h.duyck@intel$(echo .)com \
--cc=bhutchings@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox