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: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck

1 files changed, 17 insertions, 18 deletions

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 8feda9fe8297..1d3429a415e6 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1495,13 +1495,8 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
         hp100_outw(0x4210, TRACE);
         printk("hp100: %s: start_xmit_bm\n", dev->name);
 #endif
-
-        if (skb == NULL) {
-                return 0;
-        }
-
         if (skb->len <= 0)
-                return 0;
+                goto drop;
 
         if (lp->chip == HP100_CHIPID_SHASTA && skb_padto(skb, ETH_ZLEN))
                 return 0;
@@ -1514,10 +1509,10 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
 #endif
                 /* not waited long enough since last tx? */
                 if (time_before(jiffies, dev->trans_start + HZ))
-                        return -EAGAIN;
+                        goto drop;
 
                 if (hp100_check_lan(dev))
-                        return -EIO;
+                        goto drop;
 
                 if (lp->lan_type == HP100_LAN_100 && lp->hub_status < 0) {
                         /* we have a 100Mb/s adapter but it isn't connected to hub */
@@ -1551,7 +1546,7 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
                 }
 
                 dev->trans_start = jiffies;
-                return -EAGAIN;
+                goto drop;
         }
 
         /*
@@ -1591,6 +1586,10 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
         dev->trans_start = jiffies;
 
         return 0;
+
+drop:
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
 }
 
 
@@ -1648,16 +1647,11 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)
         hp100_outw(0x4212, TRACE);
         printk("hp100: %s: start_xmit\n", dev->name);
 #endif
-
-        if (skb == NULL) {
-                return 0;
-        }
-
         if (skb->len <= 0)
-                return 0;
+                goto drop;
 
         if (hp100_check_lan(dev))
-                return -EIO;
+                goto drop;
 
         /* If there is not enough free memory on the card... */
         i = hp100_inl(TX_MEM_FREE) & 0x7fffffff;
@@ -1671,7 +1665,7 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         printk("hp100: %s: trans_start timing problem\n",
                                dev->name);
 #endif
-                        return -EAGAIN;
+                        goto drop;
                 }
                 if (lp->lan_type == HP100_LAN_100 && lp->hub_status < 0) {
                         /* we have a 100Mb/s adapter but it isn't connected to hub */
@@ -1705,7 +1699,7 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         }
                 }
                 dev->trans_start = jiffies;
-                return -EAGAIN;
+                goto drop;
         }
 
         for (i = 0; i < 6000 && (hp100_inb(OPTION_MSW) & HP100_TX_CMD); i++) {
@@ -1759,6 +1753,11 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
         return 0;
+
+drop:
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
+
 }