Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Thu, 19 Jul 2012 18:17:30 +0000 (11:17 -0700)]
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

13 files changed:
1  2 
Documentation/devicetree/bindings/net/fsl-fec.txt
MAINTAINERS
drivers/net/ethernet/intel/e1000e/82571.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/scsi/bnx2i/bnx2i.h
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/bnx2i/bnx2i_iscsi.c
net/caif/caif_dev.c
net/core/dev.c
net/core/skbuff.c
net/sctp/input.c
net/sctp/socket.c
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
@@@ -193,12 -201,15 +193,15 @@@ static bool ixgbevf_clean_tx_irq(struc
        unsigned int i, eop, count = 0;
        unsigned int total_bytes = 0, total_packets = 0;
  
+       if (test_bit(__IXGBEVF_DOWN, &adapter->state))
+               return true;
        i = tx_ring->next_to_clean;
        eop = tx_ring->tx_buffer_info[i].next_to_watch;
 -      eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
 +      eop_desc = IXGBEVF_TX_DESC(tx_ring, eop);
  
        while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
 -             (count < tx_ring->work_limit)) {
 +             (count < tx_ring->count)) {
                bool cleaned = false;
                rmb(); /* read buffer_info after eop_desc */
                /* eop could change between read and DD-check */
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge