igb: minor type cleanups

[mv-sheeva.git] / drivers / net / igb / igb_main.c

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 4ccc7fc70f53ed2e1082bce8d8925786938941b1..ff392e999ffc6146a0d70912e7a9e80f827b894e 100644 (file)
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -2595,6 +2595,9 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,
                         E1000_SRRCTL_BSIZEPKT_SHIFT;
                srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
        }
+       /* Only set Drop Enable if we are supporting multiple queues */
+       if (adapter->vfs_allocated_count || adapter->num_rx_queues > 1)
+               srrctl |= E1000_SRRCTL_DROP_EN;
 
        wr32(E1000_SRRCTL(reg_idx), srrctl);
 
@@ -3431,8 +3434,8 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,
        int err;
        struct igb_buffer *buffer_info;
        u32 info = 0, tu_cmd = 0;
-       u32 mss_l4len_idx, l4len;
-       *hdr_len = 0;
+       u32 mss_l4len_idx;
+       u8 l4len;
 
        if (skb_header_cloned(skb)) {
                err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
@@ -3638,6 +3641,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
        }
 
        tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[i].gso_segs = skb_shinfo(skb)->gso_segs ?: 1;
        tx_ring->buffer_info[first].next_to_watch = i;
 
        return ++count;
@@ -3667,7 +3671,7 @@ dma_error:
 }
 
 static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
-                                   int tx_flags, int count, u32 paylen,
+                                   u32 tx_flags, int count, u32 paylen,
                                    u8 hdr_len)
 {
        union e1000_adv_tx_desc *tx_desc;
@@ -3755,7 +3759,7 @@ static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
        return 0;
 }
 
-static int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
+static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
 {
        if (igb_desc_unused(tx_ring) >= size)
                return 0;
@@ -3766,10 +3770,10 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
                                    struct igb_ring *tx_ring)
 {
        struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
-       unsigned int first;
-       unsigned int tx_flags = 0;
-       u8 hdr_len = 0;
        int tso = 0, count;
+       u32 tx_flags = 0;
+       u16 first;
+       u8 hdr_len = 0;
        union skb_shared_tx *shtx = skb_tx(skb);
 
        /* need: 1 descriptor per page,
@@ -3972,7 +3976,7 @@ void igb_update_stats(struct igb_adapter *adapter)
        struct net_device_stats *net_stats = igb_get_stats(adapter->netdev);
        struct e1000_hw *hw = &adapter->hw;
        struct pci_dev *pdev = adapter->pdev;
-       u32 rnbc;
+       u32 rnbc, reg;
        u16 phy_tmp;
        int i;
        u64 bytes, packets;
@@ -4069,8 +4073,13 @@ void igb_update_stats(struct igb_adapter *adapter)
        adapter->stats.colc += rd32(E1000_COLC);
 
        adapter->stats.algnerrc += rd32(E1000_ALGNERRC);
-       adapter->stats.rxerrc += rd32(E1000_RXERRC);
-       adapter->stats.tncrs += rd32(E1000_TNCRS);
+       /* read internal phy specific stats */
+       reg = rd32(E1000_CTRL_EXT);
+       if (!(reg & E1000_CTRL_EXT_LINK_MODE_MASK)) {
+               adapter->stats.rxerrc += rd32(E1000_RXERRC);
+               adapter->stats.tncrs += rd32(E1000_TNCRS);
+       }
+
        adapter->stats.tsctc += rd32(E1000_TSCTC);
        adapter->stats.tsctfc += rd32(E1000_TSCTFC);
 
@@ -5024,7 +5033,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
                        if (skb) {
                                unsigned int segs, bytecount;
                                /* gso_segs is currently only valid for tcp */
-                               segs = skb_shinfo(skb)->gso_segs ?: 1;
+                               segs = buffer_info->gso_segs;
                                /* multiply data chunks by size of headers */
                                bytecount = ((segs - 1) * skb_headlen(skb)) +
                                            skb->len;