From: David S. Miller Date: Fri, 21 Nov 2008 00:44:00 +0000 (-0800) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ab33d51713d6d60c7677c0d020910a8cb37e513;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of /linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c --- 6ab33d51713d6d60c7677c0d020910a8cb37e513 diff --cc drivers/net/ixgbe/ixgbe_main.c index 6fb873889e74,36f2bb666bf7..7ad07a00680a --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@@ -1301,7 -1287,34 +1301,36 @@@ static void ixgbe_set_itr(struct ixgbe_ return; } - static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter); + /** + * ixgbe_irq_disable - Mask off interrupt generation on the NIC + * @adapter: board private structure + **/ + static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter) + { + IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0); + IXGBE_WRITE_FLUSH(&adapter->hw); + if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { + int i; + for (i = 0; i < adapter->num_msix_vectors; i++) + synchronize_irq(adapter->msix_entries[i].vector); + } else { + synchronize_irq(adapter->pdev->irq); + } + } + + /** + * ixgbe_irq_enable - Enable default interrupt generation settings + * @adapter: board private structure + **/ + static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter) + { + u32 mask; + mask = IXGBE_EIMS_ENABLE_MASK; ++ if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) ++ mask |= IXGBE_EIMS_GPI_SDP1; + IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask); + IXGBE_WRITE_FLUSH(&adapter->hw); + } /** * ixgbe_intr - legacy mode Interrupt Handler diff --cc drivers/net/jme.c index 0796d0b0e338,665e70d620fc..0430ffb62364 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@@ -927,10 -927,11 +927,10 @@@ jme_alloc_and_feed_skb(struct jme_adapt jme->jme_rx(skb); } - if ((le16_to_cpu(rxdesc->descwb.flags) & RXWBFLAG_DEST) == - RXWBFLAG_DEST_MUL) + if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_DEST)) == + cpu_to_le16(RXWBFLAG_DEST_MUL)) ++(NET_STAT(jme).multicast); - jme->dev->last_rx = jiffies; NET_STAT(jme).rx_bytes += framesize; ++(NET_STAT(jme).rx_packets); } diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c index 8264d3742d08,444c5cc05f03..35cfa1524c35 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@@ -2334,10 -2341,9 +2334,9 @@@ static void iwl_bg_alive_start(struct w mutex_lock(&priv->mutex); iwl_alive_start(priv); mutex_unlock(&priv->mutex); - ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); } -static void iwl4965_bg_rf_kill(struct work_struct *work) +static void iwl_bg_rf_kill(struct work_struct *work) { struct iwl_priv *priv = container_of(work, struct iwl_priv, rf_kill);