mirror of https://gitee.com/openkylin/linux.git
e1000: De-inline functions to benefit from compiler smartness
De-inline functions to benefit from compiler smartness Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
This commit is contained in:
Auke Kok
parent
4cc15f5499
commit
e619d52349
|
|
@ -208,8 +208,8 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
|
|||
static void e1000_tx_timeout(struct net_device *dev);
|
||||
static void e1000_reset_task(struct net_device *dev);
|
||||
static void e1000_smartspeed(struct e1000_adapter *adapter);
|
||||
static inline int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
|
||||
struct sk_buff *skb);
|
||||
static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
|
||||
struct sk_buff *skb);
|
||||
|
||||
static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);
|
||||
static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
|
||||
|
|
@ -291,7 +291,7 @@ module_exit(e1000_exit_module);
|
|||
* @adapter: board private structure
|
||||
**/
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_irq_disable(struct e1000_adapter *adapter)
|
||||
{
|
||||
atomic_inc(&adapter->irq_sem);
|
||||
|
|
@ -305,7 +305,7 @@ e1000_irq_disable(struct e1000_adapter *adapter)
|
|||
* @adapter: board private structure
|
||||
**/
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_irq_enable(struct e1000_adapter *adapter)
|
||||
{
|
||||
if (likely(atomic_dec_and_test(&adapter->irq_sem))) {
|
||||
|
|
@ -349,7 +349,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
|
|||
*
|
||||
**/
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_release_hw_control(struct e1000_adapter *adapter)
|
||||
{
|
||||
uint32_t ctrl_ext;
|
||||
|
|
@ -384,7 +384,7 @@ e1000_release_hw_control(struct e1000_adapter *adapter)
|
|||
*
|
||||
**/
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_get_hw_control(struct e1000_adapter *adapter)
|
||||
{
|
||||
uint32_t ctrl_ext;
|
||||
|
|
@ -1181,7 +1181,7 @@ e1000_close(struct net_device *netdev)
|
|||
* @start: address of beginning of memory
|
||||
* @len: length of memory
|
||||
**/
|
||||
static inline boolean_t
|
||||
static boolean_t
|
||||
e1000_check_64k_bound(struct e1000_adapter *adapter,
|
||||
void *start, unsigned long len)
|
||||
{
|
||||
|
|
@ -1807,7 +1807,7 @@ e1000_free_all_tx_resources(struct e1000_adapter *adapter)
|
|||
e1000_free_tx_resources(adapter, &adapter->tx_ring[i]);
|
||||
}
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
|
||||
struct e1000_buffer *buffer_info)
|
||||
{
|
||||
|
|
@ -2400,7 +2400,7 @@ e1000_watchdog_task(struct e1000_adapter *adapter)
|
|||
#define E1000_TX_FLAGS_VLAN_MASK 0xffff0000
|
||||
#define E1000_TX_FLAGS_VLAN_SHIFT 16
|
||||
|
||||
static inline int
|
||||
static int
|
||||
e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
|
|
@ -2480,7 +2480,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
static inline boolean_t
|
||||
static boolean_t
|
||||
e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
|
|
@ -2516,7 +2516,7 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
|||
#define E1000_MAX_TXD_PWR 12
|
||||
#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
|
||||
|
||||
static inline int
|
||||
static int
|
||||
e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
||||
struct sk_buff *skb, unsigned int first, unsigned int max_per_txd,
|
||||
unsigned int nr_frags, unsigned int mss)
|
||||
|
|
@ -2625,7 +2625,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
|||
return count;
|
||||
}
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
||||
int tx_flags, int count)
|
||||
{
|
||||
|
|
@ -2689,7 +2689,7 @@ e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
|||
#define E1000_FIFO_HDR 0x10
|
||||
#define E1000_82547_PAD_LEN 0x3E0
|
||||
|
||||
static inline int
|
||||
static int
|
||||
e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
|
||||
{
|
||||
uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
|
||||
|
|
@ -2716,7 +2716,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
#define MINIMUM_DHCP_PACKET_SIZE 282
|
||||
static inline int
|
||||
static int
|
||||
e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
|
|
@ -3445,7 +3445,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
|
|||
* @sk_buff: socket buffer with received data
|
||||
**/
|
||||
|
||||
static inline void
|
||||
static void
|
||||
e1000_rx_checksum(struct e1000_adapter *adapter,
|
||||
uint32_t status_err, uint32_t csum,
|
||||
struct sk_buff *skb)
|
||||
|
|
|
|||
Loading…
Reference in New Issue