Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 21 Nov 2008 00:44:00 +0000 (16:44 -0800)]
Conflicts:

drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c

23 files changed:
1  2 
MAINTAINERS
drivers/net/atlx/atl2.c
drivers/net/ipg.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/jme.c
drivers/net/mv643xx_eth.c
drivers/net/phy/phy_device.c
drivers/net/sh_eth.c
drivers/net/smc911x.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
include/net/mac80211.h
net/core/pktgen.c
net/ipv4/af_inet.c
net/ipv4/ipmr.c
net/ipv4/udp.c
net/ipv6/ip6mr.c
net/mac80211/mlme.c
net/sched/sch_api.c
net/sched/sch_generic.c
net/socket.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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
@@@ -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);
        }
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge