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@vyatta.com> Acked-by: Shreyas Bhatewara <sbhatewara@vmware.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
379b738341
Коммит
ae316bb57d
|
@ -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
|
static void
|
||||||
vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
|
vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
|
||||||
{
|
{
|
||||||
|
|
|
@ -353,9 +353,20 @@ struct vmxnet3_adapter {
|
||||||
#define VMXNET3_MAX_ETH_HDR_SIZE 22
|
#define VMXNET3_MAX_ETH_HDR_SIZE 22
|
||||||
#define VMXNET3_MAX_SKB_BUF_SIZE (3*1024)
|
#define VMXNET3_MAX_SKB_BUF_SIZE (3*1024)
|
||||||
|
|
||||||
void set_flag_le16(__le16 *data, u16 flag);
|
static inline void set_flag_le16(__le16 *data, u16 flag)
|
||||||
void set_flag_le64(__le64 *data, u64 flag);
|
{
|
||||||
void reset_flag_le64(__le64 *data, u64 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
|
int
|
||||||
vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);
|
vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче