Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[mv-sheeva.git] / net / dcb / dcbnl.c

diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 5dbfe5fdc0d63970071945a1059d5032281071ed..8379496de82b92fe298d808981bf55edb9a50a05 100644 (file)
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -191,7 +191,7 @@ static int dcbnl_reply(u8 value, u8 event, u8 cmd, u8 attr, u32 pid,
        return 0;
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
        return ret;
 }
 
@@ -272,7 +272,7 @@ static int dcbnl_getpfccfg(struct net_device *netdev, struct nlattr **tb,
        return 0;
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        return -EINVAL;
 }
@@ -314,7 +314,7 @@ static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlattr **tb,
 
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        return -EINVAL;
 }
@@ -380,7 +380,7 @@ static int dcbnl_getcap(struct net_device *netdev, struct nlattr **tb,
        return 0;
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        return -EINVAL;
 }
@@ -458,7 +458,7 @@ static int dcbnl_getnumtcs(struct net_device *netdev, struct nlattr **tb,
        return 0;
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        return ret;
 }
@@ -687,7 +687,7 @@ err_pg:
        nla_nest_cancel(dcbnl_skb, pg_nest);
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        ret  = -EINVAL;
        return ret;
@@ -949,7 +949,7 @@ err_bcn:
        nla_nest_cancel(dcbnl_skb, bcn_nest);
 nlmsg_failure:
 err:
-       kfree(dcbnl_skb);
+       kfree_skb(dcbnl_skb);
 err_out:
        ret  = -EINVAL;
        return ret;