Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae316bb5 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Acked-by: default avatarShreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 379b7383

drivers/net/vmxnet3/vmxnet3_drv.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -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)

{

{

drivers/net/vmxnet3/vmxnet3_int.h

+14 −3
Original line number Original line Diff line number Diff line
@@ -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);