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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

5 files changed, 10 insertions, 68 deletions

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index c495fae74200..3230ea0df83c 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1469,10 +1469,7 @@ if (eni_boards) printk(KERN_INFO "loss: %ld\n",ENI_DEV(eni_boards)->lost);
 
 static void bug_int(struct atm_dev *dev,unsigned long reason)
 {
-        struct eni_dev *eni_dev;
-
         DPRINTK(">bug_int\n");
-        eni_dev = ENI_DEV(dev);
         if (reason & MID_DMA_ERR_ACK)
                 printk(KERN_CRIT DEV_LABEL "(itf %d): driver error - DMA "
                     "error\n",dev->number);
@@ -1900,7 +1897,6 @@ static void eni_close(struct atm_vcc *vcc)
 
 static int eni_open(struct atm_vcc *vcc)
 {
-        struct eni_dev *eni_dev;
         struct eni_vcc *eni_vcc;
         int error;
         short vpi = vcc->vpi;
@@ -1910,7 +1906,6 @@ static int eni_open(struct atm_vcc *vcc)
         EVENT("eni_open\n",0,0);
         if (!test_bit(ATM_VF_PARTIAL,&vcc->flags))
                 vcc->dev_data = NULL;
-        eni_dev = ENI_DEV(vcc->dev);
         if (vci != ATM_VPI_UNSPEC && vpi != ATM_VCI_UNSPEC)
                 set_bit(ATM_VF_ADDR,&vcc->flags);
         if (vcc->qos.aal != ATM_AAL0 && vcc->qos.aal != ATM_AAL5)
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 6cf59bf281dc..9a51df4f5b74 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -1801,7 +1801,7 @@ return_host_buffers:
 next_rbrq_entry:
                 he_dev->rbrq_head = (struct he_rbrq *)
                                 ((unsigned long) he_dev->rbrq_base |
-                                        RBRQ_MASK(++he_dev->rbrq_head));
+                                        RBRQ_MASK(he_dev->rbrq_head + 1));
 
         }
         read_unlock(&vcc_sklist_lock);
@@ -1884,7 +1884,7 @@ next_tbrq_entry:
                         pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
                 he_dev->tbrq_head = (struct he_tbrq *)
                                 ((unsigned long) he_dev->tbrq_base |
-                                        TBRQ_MASK(++he_dev->tbrq_head));
+                                        TBRQ_MASK(he_dev->tbrq_head + 1));
         }
 
         if (updated) {
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 048f99fe6f83..1f8d724a18bf 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -1261,14 +1261,13 @@ idt77252_rx_raw(struct idt77252_dev *card)
                                     PCI_DMA_FROMDEVICE);
 
         while (head != tail) {
-                unsigned int vpi, vci, pti;
+                unsigned int vpi, vci;
                 u32 header;
 
                 header = le32_to_cpu(*(u32 *) &queue->data[0]);
 
                 vpi = (header & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT;
                 vci = (header & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT;
-                pti = (header & ATM_HDR_PTI_MASK) >> ATM_HDR_PTI_SHIFT;
 
 #ifdef CONFIG_ATM_IDT77252_DEBUG
                 if (debug & DBG_RAW_CELL) {
@@ -2709,53 +2708,10 @@ idt77252_proc_read(struct atm_dev *dev, loff_t * pos, char *page)
 static void
 idt77252_collect_stat(struct idt77252_dev *card)
 {
-        u32 cdc, vpec, icc;
+        (void) readl(SAR_REG_CDC);
+        (void) readl(SAR_REG_VPEC);
+        (void) readl(SAR_REG_ICC);
 
-        cdc = readl(SAR_REG_CDC);
-        vpec = readl(SAR_REG_VPEC);
-        icc = readl(SAR_REG_ICC);
-
-#ifdef  NOTDEF
-        printk("%s:", card->name);
-
-        if (cdc & 0x7f0000) {
-                char *s = "";
-
-                printk(" [");
-                if (cdc & (1 << 22)) {
-                        printk("%sRM ID", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 21)) {
-                        printk("%sCON TAB", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 20)) {
-                        printk("%sNO FB", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 19)) {
-                        printk("%sOAM CRC", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 18)) {
-                        printk("%sRM CRC", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 17)) {
-                        printk("%sRM FIFO", s);
-                        s = " | ";
-                }
-                if (cdc & (1 << 16)) {
-                        printk("%sRX FIFO", s);
-                        s = " | ";
-                }
-                printk("]");
-        }
-
-        printk(" CDC %04x, VPEC %04x, ICC: %04x\n",
-               cdc & 0xffff, vpec & 0xffff, icc & 0xffff);
-#endif
 }
 
 static irqreturn_t
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 1c674a91f146..dee4f01a64d8 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -613,7 +613,6 @@ static int ia_que_tx (IADEV *iadev) {
    struct sk_buff *skb;
    int num_desc;
    struct atm_vcc *vcc;
-   struct ia_vcc *iavcc;
    num_desc = ia_avail_descs(iadev);
 
    while (num_desc && (skb = skb_dequeue(&iadev->tx_backlog))) {
@@ -627,7 +626,6 @@ static int ia_que_tx (IADEV *iadev) {
          printk("Free the SKB on closed vci %d \n", vcc->vci);
          break;
       }
-      iavcc = INPH_IA_VCC(vcc);
       if (ia_pkt_tx (vcc, skb)) {
          skb_queue_head(&iadev->tx_backlog, skb);
       }
@@ -823,8 +821,6 @@ static void IaFrontEndIntr(IADEV *iadev) {
   volatile IA_SUNI *suni;
   volatile ia_mb25_t *mb25;
   volatile suni_pm7345_t *suni_pm7345;
-  u32 intr_status;
-  u_int frmr_intr;
 
   if(iadev->phy_type & FE_25MBIT_PHY) {
      mb25 = (ia_mb25_t*)iadev->phy;
@@ -832,18 +828,18 @@ static void IaFrontEndIntr(IADEV *iadev) {
   } else if (iadev->phy_type & FE_DS3_PHY) {
      suni_pm7345 = (suni_pm7345_t *)iadev->phy;
      /* clear FRMR interrupts */
-     frmr_intr   = suni_pm7345->suni_ds3_frm_intr_stat; 
+     (void) suni_pm7345->suni_ds3_frm_intr_stat; 
      iadev->carrier_detect =  
            Boolean(!(suni_pm7345->suni_ds3_frm_stat & SUNI_DS3_LOSV));
   } else if (iadev->phy_type & FE_E3_PHY ) {
      suni_pm7345 = (suni_pm7345_t *)iadev->phy;
-     frmr_intr   = suni_pm7345->suni_e3_frm_maint_intr_ind;
+     (void) suni_pm7345->suni_e3_frm_maint_intr_ind;
      iadev->carrier_detect =
            Boolean(!(suni_pm7345->suni_e3_frm_fram_intr_ind_stat&SUNI_E3_LOS));
   }
   else { 
      suni = (IA_SUNI *)iadev->phy;
-     intr_status = suni->suni_rsop_status & 0xff;
+     (void) suni->suni_rsop_status;
      iadev->carrier_detect = Boolean(!(suni->suni_rsop_status & SUNI_LOSV));
   }
   if (iadev->carrier_detect)
@@ -2660,7 +2656,6 @@ static void ia_close(struct atm_vcc *vcc)
   
 static int ia_open(struct atm_vcc *vcc)
 {  
-        IADEV *iadev;  
         struct ia_vcc *ia_vcc;  
         int error;  
         if (!test_bit(ATM_VF_PARTIAL,&vcc->flags))  
@@ -2668,7 +2663,6 @@ static int ia_open(struct atm_vcc *vcc)
                 IF_EVENT(printk("ia: not partially allocated resources\n");)  
                 vcc->dev_data = NULL;
         }  
-        iadev = INPH_IA_DEV(vcc->dev);  
         if (vcc->vci != ATM_VPI_UNSPEC && vcc->vpi != ATM_VCI_UNSPEC)  
         {  
                 IF_EVENT(printk("iphase open: unspec part\n");)  
@@ -3052,11 +3046,9 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
 static int ia_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
         IADEV *iadev; 
-        struct ia_vcc *iavcc;
         unsigned long flags;
 
         iadev = INPH_IA_DEV(vcc->dev);
-        iavcc = INPH_IA_VCC(vcc); 
         if ((!skb)||(skb->len>(iadev->tx_buf_sz-sizeof(struct cpcs_trailer))))
         {
             if (!skb)
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index cd0ff66469b2..5d1d07645132 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -527,7 +527,6 @@ static int flash_upgrade(struct solos_card *card, int chip)
 {
         const struct firmware *fw;
         const char *fw_name;
-        uint32_t data32 = 0;
         int blocksize = 0;
         int numblocks = 0;
         int offset;
@@ -576,7 +575,7 @@ static int flash_upgrade(struct solos_card *card, int chip)
         
         dev_info(&card->dev->dev, "Changing FPGA to Update mode\n");
         iowrite32(1, card->config_regs + FPGA_MODE);
-        data32 = ioread32(card->config_regs + FPGA_MODE); 
+        (void) ioread32(card->config_regs + FPGA_MODE); 
 
         /* Set mode to Chip Erase */
         if(chip == 0 || chip == 2)