[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <89E2752CFA8EC044846EB8499819134102BF0F41F0@EXCH-MBX-4.vmware.com>
Date: Fri, 15 Oct 2010 14:14:44 -0700
From: Shreyas Bhatewara <sbhatewara@...are.com>
To: Stephen Hemminger <shemminger@...tta.com>,
"David S. Miller" <davem@...emloft.net>
CC: "VMware, Inc." <pv-drivers@...are.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [PATCH net-next] vmxnet3: make bit twiddle routines inline
Thanks for the change Stephen. Looks good.
Acked-by: Shreyas Bhatewara <sbhatewara@...are.com>
> -----Original Message-----
> From: Stephen Hemminger [mailto:shemminger@...tta.com]
> Sent: Friday, October 15, 2010 2:06 PM
> To: Shreyas Bhatewara; David S. Miller
> Cc: VMware, Inc.; netdev@...r.kernel.org
> Subject: [PATCH net-next] vmxnet3: make bit twiddle routines inline
>
> Gcc doesn't usually handle inline across compilation units, and the
> functions don't have to be global in scope. Move the set/reset flag
> functions int the existing vmxnet3 header.
>
> Signed-off-by: Stephen Hemminger <shemminger@...tta.com>
>
> ---
> drivers/net/vmxnet3/vmxnet3_drv.c | 17 -----------------
> drivers/net/vmxnet3/vmxnet3_int.h | 17 ++++++++++++++---
> 2 files changed, 14 insertions(+), 20 deletions(-)
>
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c 2010-10-15 13:58:23.378722695
> -0700
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c 2010-10-15 13:59:32.724873755
> -0700
> @@ -1548,23 +1548,6 @@ vmxnet3_free_irqs(struct vmxnet3_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)
> {
> --- a/drivers/net/vmxnet3/vmxnet3_int.h 2010-10-15 13:58:23.390723065
> -0700
> +++ b/drivers/net/vmxnet3/vmxnet3_int.h 2010-10-15 13:59:46.329296549
> -0700
> @@ -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);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists