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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)

4 files changed, 27 insertions, 19 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index c89990f5e018..101ffc965ee0 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -866,50 +866,50 @@ static void cxacru_poll_status(struct work_struct *work)
         instance->line_status = buf[CXINF_LINE_STATUS];
         switch (instance->line_status) {
         case 0:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: down\n");
                 break;
 
         case 1:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: attempting to activate\n");
                 break;
 
         case 2:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: training\n");
                 break;
 
         case 3:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: channel analysis\n");
                 break;
 
         case 4:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: exchange\n");
                 break;
 
         case 5:
                 atm_dev->link_rate = buf[CXINF_DOWNSTREAM_RATE] * 1000 / 424;
-                atm_dev->signal = ATM_PHY_SIG_FOUND;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_FOUND);
 
                 atm_info(usbatm, "ADSL line: up (%d kb/s down | %d kb/s up)\n",
                      buf[CXINF_DOWNSTREAM_RATE], buf[CXINF_UPSTREAM_RATE]);
                 break;
 
         case 6:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: waiting\n");
                 break;
 
         case 7:
-                atm_dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                 atm_info(usbatm, "ADSL line: initializing\n");
                 break;
 
         default:
-                atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
+                atm_dev_signal_change(atm_dev, ATM_PHY_SIG_UNKNOWN);
                 atm_info(usbatm, "Unknown line state %02x\n", instance->line_status);
                 break;
         }
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 1335456b4f93..80f9617d3a15 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -525,7 +525,7 @@ static void speedtch_check_status(struct work_struct *work)
 
                 switch (status) {
                 case 0:
-                        atm_dev->signal = ATM_PHY_SIG_LOST;
+                        atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                         if (instance->last_status)
                                 atm_info(usbatm, "ADSL line is down\n");
                         /* It may never resync again unless we ask it to... */
@@ -533,12 +533,12 @@ static void speedtch_check_status(struct work_struct *work)
                         break;
 
                 case 0x08:
-                        atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
+                        atm_dev_signal_change(atm_dev, ATM_PHY_SIG_UNKNOWN);
                         atm_info(usbatm, "ADSL line is blocked?\n");
                         break;
 
                 case 0x10:
-                        atm_dev->signal = ATM_PHY_SIG_LOST;
+                        atm_dev_signal_change(atm_dev, ATM_PHY_SIG_LOST);
                         atm_info(usbatm, "ADSL line is synchronising\n");
                         break;
 
@@ -554,7 +554,7 @@ static void speedtch_check_status(struct work_struct *work)
                         }
 
                         atm_dev->link_rate = down_speed * 1000 / 424;
-                        atm_dev->signal = ATM_PHY_SIG_FOUND;
+                        atm_dev_signal_change(atm_dev, ATM_PHY_SIG_FOUND);
 
                         atm_info(usbatm,
                                  "ADSL line is up (%d kb/s down | %d kb/s up)\n",
@@ -562,7 +562,7 @@ static void speedtch_check_status(struct work_struct *work)
                         break;
 
                 default:
-                        atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
+                        atm_dev_signal_change(atm_dev, ATM_PHY_SIG_UNKNOWN);
                         atm_info(usbatm, "unknown line state %02x\n", status);
                         break;
                 }
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index e213d3fa4920..ebae94480140 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -575,6 +575,13 @@ MODULE_PARM_DESC(annex,
                         sc->usbatm->atm_dev->type = val; \
         } while (0)
 
+#define UPDATE_ATM_SIGNAL(val) \
+        do { \
+                if (sc->usbatm->atm_dev) \
+                        atm_dev_signal_change(sc->usbatm->atm_dev, val); \
+        } while (0)
+
+
 /* Firmware loading */
 #define LOAD_INTERNAL     0xA0
 #define F8051_USBCS       0x7f92
@@ -1359,7 +1366,7 @@ static int uea_stat_e1(struct uea_softc *sc)
         /* always update it as atm layer could not be init when we switch to
          * operational state
          */
-        UPDATE_ATM_STAT(signal, ATM_PHY_SIG_FOUND);
+        UPDATE_ATM_SIGNAL(ATM_PHY_SIG_FOUND);
 
         /* wake up processes waiting for synchronization */
         wake_up(&sc->sync_q);
@@ -1498,7 +1505,7 @@ static int uea_stat_e4(struct uea_softc *sc)
         /* always update it as atm layer could not be init when we switch to
          * operational state
          */
-        UPDATE_ATM_STAT(signal, ATM_PHY_SIG_FOUND);
+        UPDATE_ATM_SIGNAL(ATM_PHY_SIG_FOUND);
 
         /* wake up processes waiting for synchronization */
         wake_up(&sc->sync_q);
@@ -1825,7 +1832,7 @@ static int uea_start_reset(struct uea_softc *sc)
          * So we will failed to wait Ready CMV.
          */
         sc->cmv_ack = 0;
-        UPDATE_ATM_STAT(signal, ATM_PHY_SIG_LOST);
+        UPDATE_ATM_SIGNAL(ATM_PHY_SIG_LOST);
 
         /* reset statistics */
         memset(&sc->stats, 0, sizeof(struct uea_stats));
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 5c0d06c79a81..020fa5a25fda 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -171,7 +171,8 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         int                     i, count;
         rndis_query_cmplt_type  *resp;
         struct net_device       *net;
-        const struct net_device_stats   *stats;
+        struct rtnl_link_stats64 temp;
+        const struct rtnl_link_stats64 *stats;
 
         if (!r) return -ENOMEM;
         resp = (rndis_query_cmplt_type *) r->buf;
@@ -194,7 +195,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         resp->InformationBufferOffset = cpu_to_le32 (16);
 
         net = rndis_per_dev_params[configNr].dev;
-        stats = dev_get_stats(net);
+        stats = dev_get_stats(net, &temp);
 
         switch (OID) {