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, 5 insertions, 11 deletions

diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 2dd78d20eb05..aff4f6bdf3d5 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -149,46 +149,40 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
  */
 static int lapbeth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        int err = -ENODEV;
+        int err;
 
         /*
          * Just to be *really* sure not to send anything if the interface
          * is down, the ethernet device may have gone.
          */
-        if (!netif_running(dev)) {
+        if (!netif_running(dev))
                 goto drop;
-        }
 
         switch (skb->data[0]) {
         case 0x00:
-                err = 0;
                 break;
         case 0x01:
                 if ((err = lapb_connect_request(dev)) != LAPB_OK)
                         printk(KERN_ERR "lapbeth: lapb_connect_request "
                                "error: %d\n", err);
-                goto drop_ok;
+                goto drop;
         case 0x02:
                 if ((err = lapb_disconnect_request(dev)) != LAPB_OK)
                         printk(KERN_ERR "lapbeth: lapb_disconnect_request "
                                "err: %d\n", err);
                 /* Fall thru */
         default:
-                goto drop_ok;
+                goto drop;
         }
 
         skb_pull(skb, 1);
 
         if ((err = lapb_data_request(dev, skb)) != LAPB_OK) {
                 printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err);
-                err = -ENOMEM;
                 goto drop;
         }
-        err = 0;
 out:
-        return err;
-drop_ok:
-        err = 0;
+        return NETDEV_TX_OK;
 drop:
         kfree_skb(skb);
         goto out;