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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [TIPC]: Initial activation message now includes TIPC version number
  [TIPC]: Improve response to requests for node/link information
  [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
  [IrDA]: Fix the AU1000 FIR dependencies
  [IrDA]: Fix RCU lock pairing on error path
  [XFRM]: unexport xfrm_state_mtu
  [NET]: make skb_release_data() static
  [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
  [IrDA]: MCS7780 usb_driver struct should be static
  [BNX2]: Turn off link during shutdown
  [BNX2]: Use dev_kfree_skb() instead of the _irq version
  [ATM]: basic sysfs support for ATM devices
  [ATM]: [suni] change suni_init to __devinit
  [ATM]: [iphase] should be __devinit not __init
  [ATM]: [idt77105] should be __devinit not __init
  [BNX2]: Add NETIF_F_TSO_ECN
  [NET]: Add ECN support for TSO
  [AF_UNIX]: Datagram getpeersec
  [NET]: Fix logical error in skb_gso_ok
  [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
  ...

9 files changed, 30 insertions, 19 deletions

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index fde9334059af..a486eb1f1640 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -1018,7 +1018,7 @@ he_init_irq(struct he_dev *he_dev)
         return 0;
 }
 
-static int __init
+static int __devinit
 he_start(struct atm_dev *dev)
 {
         struct he_dev *he_dev;
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 0aabfc2a59d9..325325afabec 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -358,7 +358,7 @@ static const struct atmphy_ops idt77105_ops = {
 };
 
 
-int idt77105_init(struct atm_dev *dev)
+int __devinit idt77105_init(struct atm_dev *dev)
 {
         dev->phy = &idt77105_ops;
         return 0;
diff --git a/drivers/atm/idt77105.h b/drivers/atm/idt77105.h
index 8ba8218aaefe..3fd2bc899761 100644
--- a/drivers/atm/idt77105.h
+++ b/drivers/atm/idt77105.h
@@ -76,7 +76,7 @@
 #define IDT77105_CTRSEL_RHEC    0x01    /* W, Rx HEC Error Counter */
 
 #ifdef __KERNEL__
-int idt77105_init(struct atm_dev *dev) __init;
+int idt77105_init(struct atm_dev *dev);
 #endif
 
 /*
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 2e2e50e1167a..333a7bc609d2 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2284,7 +2284,7 @@ static int reset_sar(struct atm_dev *dev)
 }  
           
           
-static int __init ia_init(struct atm_dev *dev)
+static int __devinit ia_init(struct atm_dev *dev)
 {  
         IADEV *iadev;  
         unsigned long real_base;
@@ -2480,7 +2480,7 @@ static void ia_free_rx(IADEV *iadev)
                           iadev->rx_dle_dma);  
 }
 
-static int __init ia_start(struct atm_dev *dev)
+static int __devinit ia_start(struct atm_dev *dev)
 {  
         IADEV *iadev;  
         int error;  
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index b1d063cc4fbe..f04f39c00833 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = {
 };
 
 
-int suni_init(struct atm_dev *dev)
+int __devinit suni_init(struct atm_dev *dev)
 {
         unsigned char mri;
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7635736cc791..d55b0f7939a6 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.4.42"
-#define DRV_MODULE_RELDATE      "June 12, 2006"
+#define DRV_MODULE_VERSION      "1.4.43"
+#define DRV_MODULE_RELDATE      "June 28, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp)
 
                 tx_free_bd += last + 1;
 
-                dev_kfree_skb_irq(skb);
+                dev_kfree_skb(skb);
 
                 hw_cons = bp->hw_tx_cons =
                         sblk->status_tx_quick_consumer_index0;
@@ -1824,7 +1824,7 @@ reuse_rx:
                 if ((len > (bp->dev->mtu + ETH_HLEN)) &&
                         (ntohs(skb->protocol) != 0x8100)) {
 
-                        dev_kfree_skb_irq(skb);
+                        dev_kfree_skb(skb);
                         goto next_rx;
 
                 }
@@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
                                 skb_shinfo(skb)->frags[j].size,
                                 PCI_DMA_TODEVICE);
                 }
-                dev_kfree_skb_any(skb);
+                dev_kfree_skb(skb);
                 i += j + 1;
         }
 
@@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
 
                 rx_buf->skb = NULL;
 
-                dev_kfree_skb_any(skb);
+                dev_kfree_skb(skb);
         }
 }
 
@@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
         udelay(5);
 
         pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
-        dev_kfree_skb_irq(skb);
+        dev_kfree_skb(skb);
 
         if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) {
                 goto loopback_test_done;
@@ -4541,7 +4541,7 @@ bnx2_close(struct net_device *dev)
         bnx2_netif_stop(bp);
         del_timer_sync(&bp->timer);
         if (bp->flags & NO_WOL_FLAG)
-                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
         else if (bp->wol)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
         else
@@ -5128,6 +5128,16 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data)
         return 0;
 }
 
+static int
+bnx2_set_tso(struct net_device *dev, u32 data)
+{
+        if (data)
+                dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
+        else
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
+        return 0;
+}
+
 #define BNX2_NUM_STATS 46
 
 static struct {
@@ -5445,7 +5455,7 @@ static struct ethtool_ops bnx2_ethtool_ops = {
         .set_sg                 = ethtool_op_set_sg,
 #ifdef BCM_TSO
         .get_tso                = ethtool_op_get_tso,
-        .set_tso                = ethtool_op_set_tso,
+        .set_tso                = bnx2_set_tso,
 #endif
         .self_test_count        = bnx2_self_test_count,
         .self_test              = bnx2_self_test,
@@ -5926,7 +5936,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
 #endif
 #ifdef BCM_TSO
-        dev->features |= NETIF_F_TSO;
+        dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
 #endif
 
         netif_carrier_off(bp->dev);
@@ -5968,7 +5978,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
         netif_device_detach(dev);
         del_timer_sync(&bp->timer);
         if (bp->flags & NO_WOL_FLAG)
-                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
         else if (bp->wol)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
         else
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5845e334941b..658c5ee95c73 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -4174,6 +4174,7 @@ struct fw_info {
 #define BNX2_DRV_MSG_CODE_PULSE                  0x06000000
 #define BNX2_DRV_MSG_CODE_DIAG                   0x07000000
 #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL         0x09000000
+#define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN          0x0b000000
 
 #define BNX2_DRV_MSG_DATA                        0x00ff0000
 #define BNX2_DRV_MSG_DATA_WAIT0                  0x00010000
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index d2ce4896abff..e9e6d99a9add 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -350,7 +350,7 @@ config TOSHIBA_FIR
 
 config AU1000_FIR
         tristate "Alchemy Au1000 SIR/FIR"
-        depends on MIPS_AU1000 && IRDA
+        depends on SOC_AU1000 && IRDA
 
 config SMC_IRCC_FIR
         tristate "SMSC IrCC (EXPERIMENTAL)"
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 754297fc8f22..47f6f64d604c 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -101,7 +101,7 @@ static int transceiver_type = MCS_TSC_VISHAY;
 module_param(transceiver_type, int, 0444);
 MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h.");
 
-struct usb_driver mcs_driver = {
+static struct usb_driver mcs_driver = {
         .name = "mcs7780",
         .probe = mcs_probe,
         .disconnect = mcs_disconnect,