From 1e59f982bc983e9db569681b58b1c2e88dfd80ff Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Fri, 15 Oct 2010 11:06:20 +0000
Subject: [PATCH] --- yaml --- r: 215407 b: refs/heads/master c:
 ae316bb57d25d73ae9c1ddc9c59fe56d733849bf h: refs/heads/master i:   215405:
 54a78bb3f6528e9dd2224e93f061256d6bf87d45   215403:
 673a0efb337e4d3c12e6cab795c8e16ed74f190e   215399:
 cf6c63950021aff93f251e70d0e9d1da51fa2517   215391:
 00f931faad36a8df8d20a0871abd4e6abbd318df v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 17 -----------------
 trunk/drivers/net/vmxnet3/vmxnet3_int.h | 17 ++++++++++++++---
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 2df6e73de293..c52f570c5929 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 379b7383413d883ffc4db55914626ca303e6f7f5
+refs/heads/master: ae316bb57d25d73ae9c1ddc9c59fe56d733849bf
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index b1de73b1bf1a..3f60e0e3097b 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1548,23 +1548,6 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
 	}
 }
 
-
-inline void set_flag_le16(__le16 *data, u16 flag)
-{
-	*data = cpu_to_le16(le16_to_cpu(*data) | flag);
-}
-
-inline void set_flag_le64(__le64 *data, u64 flag)
-{
-	*data = cpu_to_le64(le64_to_cpu(*data) | flag);
-}
-
-inline void reset_flag_le64(__le64 *data, u64 flag)
-{
-	*data = cpu_to_le64(le64_to_cpu(*data) & ~flag);
-}
-
-
 static void
 vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 {
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_int.h b/trunk/drivers/net/vmxnet3/vmxnet3_int.h
index 2121c735cabd..c88ea5cbba0d 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_int.h
@@ -353,9 +353,20 @@ struct vmxnet3_adapter {
 #define VMXNET3_MAX_ETH_HDR_SIZE    22
 #define VMXNET3_MAX_SKB_BUF_SIZE    (3*1024)
 
-void set_flag_le16(__le16 *data, u16 flag);
-void set_flag_le64(__le64 *data, u64 flag);
-void reset_flag_le64(__le64 *data, u64 flag);
+static inline void set_flag_le16(__le16 *data, u16 flag)
+{
+	*data = cpu_to_le16(le16_to_cpu(*data) | flag);
+}
+
+static inline void set_flag_le64(__le64 *data, u64 flag)
+{
+	*data = cpu_to_le64(le64_to_cpu(*data) | flag);
+}
+
+static inline void reset_flag_le64(__le64 *data, u64 flag)
+{
+	*data = cpu_to_le64(le64_to_cpu(*data) & ~flag);
+}
 
 int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);