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

* HEAD:
  [AX.25]: Use kzalloc
  [ATM] net/atm/clip.c: fix PROC_FS=n compile
  [PKT_SCHED]: act_api: Fix module leak while flushing actions
  [NET]: Fix IPv4/DECnet routing rule dumping
  [NET] gso: Fix up GSO packets with broken checksums
  [NET] gso: Add skb_is_gso
  [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
  [ATM]: fix possible recursive locking in skb_migrate()
  [ATM]: Typo in drivers/atm/Kconfig...
  [TG3]: add amd8131 to "write reorder" chipsets
  [NET]: Fix network device interface printk message priority

11 files changed, 16 insertions, 14 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 64b6a72b4f6a..db73de0d2511 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1639,7 +1639,7 @@ bnx2_tx_int(struct bnx2 *bp)
                 skb = tx_buf->skb;
 #ifdef BCM_TSO 
                 /* partial BD completions possible with TSO packets */
-                if (skb_shinfo(skb)->gso_size) {
+                if (skb_is_gso(skb)) {
                         u16 last_idx, last_ring_idx;
 
                         last_idx = sw_cons +
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 87f94d939ff8..61b3754f50ff 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1417,7 +1417,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct cpl_tx_pkt *cpl;
 
 #ifdef NETIF_F_TSO
-        if (skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 int eth_type;
                 struct cpl_tx_pkt_lso *hdr;
 
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f06b281c8f6e..6e7d31bacf4d 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2524,7 +2524,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
         uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
         int err;
 
-        if (skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 if (skb_header_cloned(skb)) {
                         err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                         if (err)
@@ -2649,7 +2649,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                  * tso gets written back prematurely before the data is fully
                  * DMA'd to the controller */
                 if (!skb->data_len && tx_ring->last_tx_tso &&
-                    !skb_shinfo(skb)->gso_size) {
+                    !skb_is_gso(skb)) {
                         tx_ring->last_tx_tso = 0;
                         size -= 4;
                 }
@@ -2937,8 +2937,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
 #ifdef NETIF_F_TSO
         /* Controller Erratum workaround */
-        if (!skb->data_len && tx_ring->last_tx_tso &&
-            !skb_shinfo(skb)->gso_size)
+        if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
                 count++;
 #endif
 
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 037d870712ff..ad81ec68f887 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1495,7 +1495,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
         np->tx_skbuff[nr] = skb;
 
 #ifdef NETIF_F_TSO
-        if (skb_shinfo(skb)->gso_size)
+        if (skb_is_gso(skb))
                 tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
         else
 #endif
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index bf1fca5a3fa0..e3c8cd5eca67 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -146,7 +146,7 @@ static int __init ali_ircc_init(void)
 {
         ali_chip_t *chip;
         chipio_t info;
-        int ret = -ENODEV;
+        int ret;
         int cfg, cfg_base;
         int reg, revision;
         int i = 0;
@@ -160,6 +160,7 @@ static int __init ali_ircc_init(void)
                 return ret;
         }
 
+        ret = -ENODEV;
         
         /* Probe for all the ALi chipsets we know about */
         for (chip= chips; chip->name; chip++, i++) 
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index b91e082483f6..7eb08d929139 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1173,7 +1173,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         uint16_t ipcse, tucse, mss;
         int err;
 
-        if(likely(skb_shinfo(skb)->gso_size)) {
+        if (likely(skb_is_gso(skb))) {
                 if (skb_header_cloned(skb)) {
                         err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                         if (err)
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 43fef7de8cb9..997cbce9af6e 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
 #ifdef LOOPBACK_TSO
-        if (skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 BUG_ON(skb->protocol != htons(ETH_P_IP));
                 BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index f4c8fd373b9b..ee1de971a712 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2116,7 +2116,7 @@ abort_linearize:
                 }
                 idx = (idx + 1) & tx->mask;
         } while (idx != last_idx);
-        if (skb_shinfo(skb)->gso_size) {
+        if (skb_is_gso(skb)) {
                 printk(KERN_ERR
                        "myri10ge: %s: TSO but wanted to linearize?!?!?\n",
                        mgp->dev->name);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 418f169a6a31..31093760aa1e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1159,7 +1159,7 @@ static unsigned tx_le_req(const struct sk_buff *skb)
         count = sizeof(dma_addr_t) / sizeof(u32);
         count += skb_shinfo(skb)->nr_frags * count;
 
-        if (skb_shinfo(skb)->gso_size)
+        if (skb_is_gso(skb))
                 ++count;
 
         if (skb->ip_summed == CHECKSUM_HW)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f645921aff8b..ce6f3be86da0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10078,6 +10078,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         static struct pci_device_id write_reorder_chipsets[] = {
                 { PCI_DEVICE(PCI_VENDOR_ID_AMD,
                              PCI_DEVICE_ID_AMD_FE_GATE_700C) },
+                { PCI_DEVICE(PCI_VENDOR_ID_AMD,
+                             PCI_DEVICE_ID_AMD_8131_BRIDGE) },
                 { PCI_DEVICE(PCI_VENDOR_ID_VIA,
                              PCI_DEVICE_ID_VIA_8385_0) },
                 { },
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 063816f2b11e..4103c37172f9 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -805,7 +805,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
          * If problems develop with TSO, check this first.
          */
         numDesc = skb_shinfo(skb)->nr_frags + 1;
-        if(skb_tso_size(skb))
+        if (skb_is_gso(skb))
                 numDesc++;
 
         /* When checking for free space in the ring, we need to also
@@ -845,7 +845,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                                 TYPHOON_TX_PF_VLAN_TAG_SHIFT);
         }
 
-        if(skb_tso_size(skb)) {
+        if (skb_is_gso(skb)) {
                 first_txd->processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;
                 first_txd->numDesc++;