Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (55 commits)
  sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
  sctp: correct bounds check in sctp_setsockopt_auth_key
  wan: Missing capability checks in sbni_ioctl()
  e100, fix iomap read
  qeth: preallocated header account offset
  qeth: l2 write unicast list to hardware
  qeth: use -EOPNOTSUPP instead of -ENOTSUPP.
  ibm_newemac: Don't call dev_mc_add() before device is registered
  net: don't grab a mutex within a timer context in gianfar
  forcedeth: fix checksum flag
  net/usb/mcs7830: add set_mac_address
  net/usb/mcs7830: new device IDs
  [netdrvr] smc91x: fix resource removal (null ptr deref)
  ibmveth: fix bad UDP checksums
  [netdrvr] hso: dev_kfree_skb crash fix
  [netdrvr] hso: icon 322 detection fix
  atl1: disable TSO by default
  atl1e: multistatement if missing braces
  igb: remove 82576 quad adapter
  drivers/net/skfp/ess.c: fix compile warnings
  ...

diff --combined drivers/net/myri10ge/myri10ge.c
index 54cd89cb0838fd46ad379943e78763289d66630c,f6847531bf9e6c026aa1dc34d4ed0bb72205d6ae..d6524db321afe06c76eecce80bc3bee52e68355a
--- 1/drivers/net/myri10ge/myri10ge.c
--- 2/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@@ -56,6 -56,7 +56,6 @@@
  #include <linux/ethtool.h>
  #include <linux/firmware.h>
  #include <linux/delay.h>
 -#include <linux/version.h>
  #include <linux/timer.h>
  #include <linux/vmalloc.h>
  #include <linux/crc32.h>
@@@ -75,7 -76,7 +75,7 @@@
  #include "myri10ge_mcp.h"
  #include "myri10ge_mcp_gen_header.h"
  
- #define MYRI10GE_VERSION_STR "1.3.99-1.347"
+ #define MYRI10GE_VERSION_STR "1.4.3-1.358"
  
  MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
  MODULE_AUTHOR("Maintainer: help@myri.com");

diff --combined drivers/s390/net/ctcm_mpc.c
index 2de1e2fccbf9f5d5f740143843caf38e0149a833,407f816f091bbe2fcfb3ba0066787a69c194de39..cbe470493bf01487c6e99ff09f51945732dcfbb3
--- 1/drivers/s390/net/ctcm_mpc.c
--- 2/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@@ -19,6 -19,7 +19,6 @@@
  #undef DEBUGDATA
  #undef DEBUGCCW
  
 -#include <linux/version.h>
  #include <linux/module.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
@@@ -312,10 -313,10 +312,10 @@@ static struct net_device *ctcmpc_get_de
                                        CTCM_FUNTAIL, device);
                return NULL;
        }
-       priv = dev->priv;
+       priv = dev->ml_priv;
        if (priv == NULL) {
                CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
-                       "%s(%s): dev->priv is NULL",
+                       "%s(%s): dev->ml_priv is NULL",
                                        CTCM_FUNTAIL, device);
                return NULL;
        }
@@@ -344,7 -345,7 +344,7 @@@ int ctc_mpc_alloc_channel(int port_num
        dev = ctcmpc_get_dev(port_num);
        if (dev == NULL)
                return 1;
-       priv = dev->priv;
+       priv = dev->ml_priv;
        grp = priv->mpcg;
  
        grp->allochanfunc = callback;
@@@ -416,7 -417,7 +416,7 @@@ void ctc_mpc_establish_connectivity(in
        dev = ctcmpc_get_dev(port_num);
        if (dev == NULL)
                return;
-       priv = dev->priv;
+       priv = dev->ml_priv;
        grp = priv->mpcg;
        rch = priv->channel[READ];
        wch = priv->channel[WRITE];
@@@ -534,7 -535,7 +534,7 @@@ void ctc_mpc_dealloc_ch(int port_num
        dev = ctcmpc_get_dev(port_num);
        if (dev == NULL)
                return;
-       priv = dev->priv;
+       priv = dev->ml_priv;
        grp = priv->mpcg;
  
        CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG,
@@@ -570,7 -571,7 +570,7 @@@ void ctc_mpc_flow_control(int port_num
        dev = ctcmpc_get_dev(port_num);
        if (dev == NULL)
                return;
-       priv = dev->priv;
+       priv = dev->ml_priv;
        grp = priv->mpcg;
  
        CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG,
@@@ -619,7 -620,7 +619,7 @@@ static void mpc_rcvd_sweep_resp(struct 
  {
        struct channel    *rch = mpcginfo->ch;
        struct net_device *dev = rch->netdev;
-       struct ctcm_priv   *priv = dev->priv;
+       struct ctcm_priv   *priv = dev->ml_priv;
        struct mpc_group  *grp = priv->mpcg;
        struct channel    *ch = priv->channel[WRITE];
  
@@@ -650,7 -651,7 +650,7 @@@
  static void ctcmpc_send_sweep_resp(struct channel *rch)
  {
        struct net_device *dev = rch->netdev;
-       struct ctcm_priv *priv = dev->priv;
+       struct ctcm_priv *priv = dev->ml_priv;
        struct mpc_group *grp = priv->mpcg;
        int rc = 0;
        struct th_sweep *header;
@@@ -712,7 -713,7 +712,7 @@@ static void mpc_rcvd_sweep_req(struct m
  {
        struct channel    *rch     = mpcginfo->ch;
        struct net_device *dev     = rch->netdev;
-       struct ctcm_priv  *priv = dev->priv;
+       struct ctcm_priv  *priv = dev->ml_priv;
        struct mpc_group  *grp  = priv->mpcg;
        struct channel    *ch      = priv->channel[WRITE];
  
@@@ -846,7 -847,7 +846,7 @@@ static int mpcg_fsm_len = ARRAY_SIZE(mp
  static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
  {
        struct net_device *dev = arg;
-       struct ctcm_priv *priv = dev->priv;
+       struct ctcm_priv *priv = dev->ml_priv;
        struct mpc_group *grp = priv->mpcg;
  
        if (grp == NULL) {
@@@ -890,7 -891,7 +890,7 @@@
  void mpc_group_ready(unsigned long adev)
  {
        struct net_device *dev = (struct net_device *)adev;
-       struct ctcm_priv *priv = dev->priv;
+       struct ctcm_priv *priv = dev->ml_priv;
        struct mpc_group *grp = priv->mpcg;
        struct channel *ch = NULL;
  
@@@ -946,7 -947,7 +946,7 @@@
  void mpc_channel_action(struct channel *ch, int direction, int action)
  {
        struct net_device  *dev  = ch->netdev;
-       struct ctcm_priv   *priv = dev->priv;
+       struct ctcm_priv   *priv = dev->ml_priv;
        struct mpc_group   *grp  = priv->mpcg;
  
        if (grp == NULL) {
@@@ -1056,7 -1057,7 +1056,7 @@@ done
  static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
  {
        struct net_device *dev  = ch->netdev;
-       struct ctcm_priv *priv = dev->priv;
+       struct ctcm_priv *priv = dev->ml_priv;
        struct mpc_group *grp = priv->mpcg;
        struct pdu *curr_pdu;
        struct mpcg_info *mpcginfo;
@@@ -1254,7 -1255,7 +1254,7 @@@ void ctcmpc_bh(unsigned long thischan
        struct channel    *ch   = (struct channel *)thischan;
        struct sk_buff    *skb;
        struct net_device *dev  = ch->netdev;
-       struct ctcm_priv  *priv = dev->priv;
+       struct ctcm_priv  *priv = dev->ml_priv;
        struct mpc_group  *grp  = priv->mpcg;
  
        CTCM_PR_DEBUG("%s cp:%i enter:  %s() %s\n",
@@@ -1376,7 -1377,7 +1376,7 @@@ static void mpc_action_go_inop(fsm_inst
        BUG_ON(dev == NULL);
        CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name);
  
-       priv  = dev->priv;
+       priv  = dev->ml_priv;
        grp =  priv->mpcg;
        grp->flow_off_called = 0;
        fsm_deltimer(&grp->timer);
@@@ -1482,7 -1483,7 +1482,7 @@@ static void mpc_action_timeout(fsm_inst
  
        BUG_ON(dev == NULL);
  
-       priv = dev->priv;
+       priv = dev->ml_priv;
        grp = priv->mpcg;
        wch = priv->channel[WRITE];
        rch = priv->channel[READ];
@@@ -1520,7 -1521,7 +1520,7 @@@ void mpc_action_discontact(fsm_instanc
        if (ch) {
                dev = ch->netdev;
                if (dev) {
-                       priv = dev->priv;
+                       priv = dev->ml_priv;
                        if (priv) {
                                CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE,
                                        "%s: %s: %s\n",
@@@ -1568,7 -1569,7 +1568,7 @@@ static int mpc_validate_xid(struct mpcg
  {
        struct channel     *ch   = mpcginfo->ch;
        struct net_device  *dev  = ch->netdev;
-       struct ctcm_priv   *priv = dev->priv;
+       struct ctcm_priv   *priv = dev->ml_priv;
        struct mpc_group   *grp  = priv->mpcg;
        struct xid2        *xid  = mpcginfo->xid;
        int     rc       = 0;
@@@ -1865,7 -1866,7 +1865,7 @@@ static void mpc_action_doxid0(fsm_insta
  {
        struct channel     *ch   = arg;
        struct net_device  *dev  = ch->netdev;
-       struct ctcm_priv   *priv = dev->priv;
+       struct ctcm_priv   *priv = dev->ml_priv;
        struct mpc_group   *grp  = priv->mpcg;
  
        CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@@ -1905,7 -1906,7 +1905,7 @@@
  static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg)
  {
        struct net_device *dev = arg;
-       struct ctcm_priv  *priv = dev->priv;
+       struct ctcm_priv  *priv = dev->ml_priv;
        struct mpc_group  *grp  = NULL;
        int direction;
        int send = 0;
@@@ -1982,7 -1983,7 +1982,7 @@@ static void mpc_action_rcvd_xid0(fsm_in
        struct mpcg_info   *mpcginfo  = arg;
        struct channel     *ch   = mpcginfo->ch;
        struct net_device  *dev  = ch->netdev;
-       struct ctcm_priv   *priv = dev->priv;
+       struct ctcm_priv   *priv = dev->ml_priv;
        struct mpc_group   *grp  = priv->mpcg;
  
        CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n",
@@@ -2044,7 -2045,7 +2044,7 @@@ static void mpc_action_rcvd_xid7(fsm_in
        struct mpcg_info   *mpcginfo   = arg;
        struct channel     *ch         = mpcginfo->ch;
        struct net_device  *dev        = ch->netdev;
-       struct ctcm_priv   *priv    = dev->priv;
+       struct ctcm_priv   *priv    = dev->ml_priv;
        struct mpc_group   *grp     = priv->mpcg;
  
        CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@@ -2096,7 -2097,7 +2096,7 @@@ static int mpc_send_qllc_discontact(str
        __u32   new_len = 0;
        struct sk_buff   *skb;
        struct qllc      *qllcptr;
-       struct ctcm_priv *priv = dev->priv;
+       struct ctcm_priv *priv = dev->ml_priv;
        struct mpc_group *grp = priv->mpcg;
  
        CTCM_PR_DEBUG("%s: GROUP STATE: %s\n",