Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Sun, 29 Nov 2009 08:57:15 +0000 (00:57 -0800)]
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c

24 files changed:
1  2 
drivers/ieee802154/fakehard.c
drivers/net/Kconfig
drivers/net/au1000_eth.c
drivers/net/e1000e/e1000.h
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
drivers/net/e1000e/phy.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/macvlan.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_hdr.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/stmmac/stmmac_main.c
drivers/net/veth.c
include/net/sctp/structs.h
net/core/pktgen.c
net/mac80211/agg-tx.c
net/mac80211/ieee80211_i.h
net/mac80211/util.c
net/rfkill/core.c
net/sctp/outqueue.c
net/sctp/sm_sideeffect.c
net/sctp/transport.c

@@@ -282,8 -260,6 +282,9 @@@ static int ieee802154_fake_close(struc
  static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
                                              struct net_device *dev)
  {
 +      skb->skb_iif = dev->ifindex;
 +      skb->dev = dev;
++
        dev->stats.tx_packets++;
        dev->stats.tx_bytes += skb->len;
  
Simple merge
Simple merge
Simple merge
@@@ -1110,11 -1118,12 +1110,12 @@@ static s32 e1000_oem_bits_config_ich8la
                        oem_reg |= HV_OEM_BITS_LPLU;
        }
        /* Restart auto-neg to activate the bits */
-       oem_reg |= HV_OEM_BITS_RESTART_AN;
+       if (!e1000_check_reset_block(hw))
+               oem_reg |= HV_OEM_BITS_RESTART_AN;
 -      ret_val = hw->phy.ops.write_phy_reg_locked(hw, HV_OEM_BITS, oem_reg);
 +      ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
  
  out:
 -      hw->phy.ops.release_phy(hw);
 +      hw->phy.ops.release(hw);
  
        return ret_val;
  }
Simple merge
@@@ -659,16 -658,7 +658,7 @@@ s32 e1000_copper_link_setup_82577(struc
        /* Enable downshift */
        phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
  
 -      ret_val = phy->ops.write_phy_reg(hw, I82577_CFG_REG, phy_data);
 +      ret_val = phy->ops.write_reg(hw, I82577_CFG_REG, phy_data);
-       if (ret_val)
-               goto out;
-       /* Set number of link attempts before downshift */
-       ret_val = phy->ops.read_reg(hw, I82577_CTRL_REG, &phy_data);
-       if (ret_val)
-               goto out;
-       phy_data &= ~I82577_CTRL_DOWNSHIFT_MASK;
-       ret_val = phy->ops.write_reg(hw, I82577_CTRL_REG, phy_data);
  
  out:
        return ret_val;
@@@ -2678,10 -2667,10 +2667,10 @@@ static s32 __e1000_read_phy_reg_hv(stru
  out:
        /* Revert to MDIO fast mode, if applicable */
        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-               ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
+               ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
  
        if (!locked)
 -              hw->phy.ops.release_phy(hw);
 +              hw->phy.ops.release(hw);
  
        return ret_val;
  }
@@@ -2805,10 -2793,10 +2793,10 @@@ static s32 __e1000_write_phy_reg_hv(str
  out:
        /* Revert to MDIO fast mode, if applicable */
        if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-               ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
+               ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
  
        if (!locked)
 -              hw->phy.ops.release_phy(hw);
 +              hw->phy.ops.release(hw);
  
        return ret_val;
  }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -635,9 -600,8 +634,9 @@@ void sctp_transport_reset(struct sctp_t
         * (see Section 6.2.1)
         */
        t->cwnd = min(4*asoc->pathmtu, max_t(__u32, 2*asoc->pathmtu, 4380));
 +      t->burst_limited = 0;
        t->ssthresh = asoc->peer.i.a_rwnd;
-       t->last_rto = t->rto = asoc->rto_initial;
+       t->rto = asoc->rto_initial;
        t->rtt = 0;
        t->srtt = 0;
        t->rttvar = 0;