Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c5661c5..4fc812f 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1721,7 +1721,8 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev,
                break;
        }
  finish:
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -2404,7 +2405,8 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag
                        goto nla_put_failure;
        }
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -3838,7 +3840,8 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
                    sinfo->assoc_req_ies))
                goto nla_put_failure;
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -4568,7 +4571,8 @@ static int nl80211_send_mpath(struct sk_buff *msg, u32 portid, u32 seq,
 
        nla_nest_end(msg, pinfoattr);
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -5520,7 +5524,8 @@ static int nl80211_send_regdom(struct sk_buff *msg, struct netlink_callback *cb,
            nla_put_flag(msg, NL80211_ATTR_WIPHY_SELF_MANAGED_REG))
                goto nla_put_failure;
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
 nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -6590,7 +6595,8 @@ static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,
 
        nla_nest_end(msg, bss);
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  fail_unlock_rcu:
        rcu_read_unlock();
@@ -6699,7 +6705,8 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 portid, u32 seq,
 
        nla_nest_end(msg, infoattr);
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -11038,7 +11045,8 @@ static int nl80211_send_scan_msg(struct sk_buff *msg,
        /* ignore errors and send incomplete event anyway */
        nl80211_add_scan_req(msg, rdev);
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);
@@ -11061,7 +11069,8 @@ nl80211_send_sched_scan_msg(struct sk_buff *msg,
            nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex))
                goto nla_put_failure;
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return 0;
 
  nla_put_failure:
        genlmsg_cancel(msg, hdr);