Commit 0e15df49 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher

e1000e: minor whitespace and indentation cleanup

Cleanup of some whitespace and indentation of a single code block.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e885d762
...@@ -280,8 +280,8 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val) ...@@ -280,8 +280,8 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
#define er16flash(reg) __er16flash(hw, (reg)) #define er16flash(reg) __er16flash(hw, (reg))
#define er32flash(reg) __er32flash(hw, (reg)) #define er32flash(reg) __er32flash(hw, (reg))
#define ew16flash(reg,val) __ew16flash(hw, (reg), (val)) #define ew16flash(reg, val) __ew16flash(hw, (reg), (val))
#define ew32flash(reg,val) __ew32flash(hw, (reg), (val)) #define ew32flash(reg, val) __ew32flash(hw, (reg), (val))
static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw) static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
{ {
......
...@@ -1268,15 +1268,16 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, ...@@ -1268,15 +1268,16 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
{ {
/* /*
* this looks ugly, but it seems compiler issues make it * this looks ugly, but it seems compiler issues make
* more efficient than reusing j * it more efficient than reusing j
*/ */
int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]); int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
/* /*
* page alloc/put takes too long and effects small packet * page alloc/put takes too long and effects small
* throughput, so unsplit small packets and save the alloc/put * packet throughput, so unsplit small packets and
* only valid in softirq (napi) context to call kmap_* * save the alloc/put only valid in softirq (napi)
* context to call kmap_*
*/ */
if (l1 && (l1 <= copybreak) && if (l1 && (l1 <= copybreak) &&
((length + l1) <= adapter->rx_ps_bsize0)) { ((length + l1) <= adapter->rx_ps_bsize0)) {
...@@ -1289,13 +1290,18 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, ...@@ -1289,13 +1290,18 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
* kmap_atomic, so we can't hold the mapping * kmap_atomic, so we can't hold the mapping
* very long * very long
*/ */
dma_sync_single_for_cpu(&pdev->dev, ps_page->dma, dma_sync_single_for_cpu(&pdev->dev,
PAGE_SIZE, DMA_FROM_DEVICE); ps_page->dma,
vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ); PAGE_SIZE,
DMA_FROM_DEVICE);
vaddr = kmap_atomic(ps_page->page,
KM_SKB_DATA_SOFTIRQ);
memcpy(skb_tail_pointer(skb), vaddr, l1); memcpy(skb_tail_pointer(skb), vaddr, l1);
kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
dma_sync_single_for_device(&pdev->dev, ps_page->dma, dma_sync_single_for_device(&pdev->dev,
PAGE_SIZE, DMA_FROM_DEVICE); ps_page->dma,
PAGE_SIZE,
DMA_FROM_DEVICE);
/* remove the CRC */ /* remove the CRC */
if (!(adapter->flags2 & FLAG2_CRC_STRIPPING)) if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
...@@ -4969,7 +4975,7 @@ static int e1000_maybe_stop_tx(struct e1000_ring *tx_ring, int size) ...@@ -4969,7 +4975,7 @@ static int e1000_maybe_stop_tx(struct e1000_ring *tx_ring, int size)
return __e1000_maybe_stop_tx(tx_ring, size); return __e1000_maybe_stop_tx(tx_ring, size);
} }
#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) #define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1)
static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
struct net_device *netdev) struct net_device *netdev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment