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: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 12 insertions, 10 deletions

diff --git a/net/can/raw.c b/net/can/raw.c
index 6e0663faaf9f..27aab63df467 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -641,17 +641,12 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
 
         skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT,
                                   &err);
-        if (!skb) {
-                dev_put(dev);
-                return err;
-        }
+        if (!skb)
+                goto put_dev;
 
         err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
-        if (err < 0) {
-                kfree_skb(skb);
-                dev_put(dev);
-                return err;
-        }
+        if (err < 0)
+                goto free_skb;
         skb->dev = dev;
         skb->sk  = sk;
 
@@ -660,9 +655,16 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
         dev_put(dev);
 
         if (err)
-                return err;
+                goto send_failed;
 
         return size;
+
+free_skb:
+        kfree_skb(skb);
+put_dev:
+        dev_put(dev);
+send_failed:
+        return err;
 }
 
 static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,