Re: [PATCH 2/3] nl80211: Fix checkpatch warnings about blank lines
Hi All, On Sun, May 29, 2016 at 1:31 PM, Kirtika Ruchandaniwrote: > This patch fixes the following checkpatch.pl issues - > - Please don't use multiple blank lines > - Blank lines aren't necessary before a close brace > - Missing a blank line after declarations > > Signed-off-by: Kirtika Ruchandani Looks sensible to me Reviewed-by: Julian Calaby Thanks, Julian Calaby > --- > net/wireless/nl80211.c | 22 ++ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c > index 50a0de0..cd422bd 100644 > --- a/net/wireless/nl80211.c > +++ b/net/wireless/nl80211.c > @@ -167,6 +167,7 @@ __cfg80211_rdev_from_attrs(struct net *netns, struct > nlattr **attrs) > > if (attrs[NL80211_ATTR_IFINDEX]) { > int ifindex = nla_get_u32(attrs[NL80211_ATTR_IFINDEX]); > + > netdev = __dev_get_by_index(netns, ifindex); > if (netdev) { > if (netdev->ieee80211_ptr) > @@ -730,6 +731,7 @@ static int nl80211_parse_key_new(struct nlattr *key, > struct key_parse *k) > > if (tb[NL80211_KEY_DEFAULT_TYPES]) { > struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES]; > + > err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1, >tb[NL80211_KEY_DEFAULT_TYPES], >nl80211_key_default_policy); > @@ -1381,6 +1383,7 @@ static int nl80211_send_wiphy(struct > cfg80211_registered_device *rdev, > rdev->ops->get_antenna) { > u32 tx_ant = 0, rx_ant = 0; > int res; > + > res = rdev_get_antenna(rdev, _ant, _ant); > if (!res) { > if (nla_put_u32(msg, > @@ -2111,7 +2114,6 @@ static int nl80211_set_wds_peer(struct sk_buff *skb, > struct genl_info *info) > return rdev_set_wds_peer(rdev, dev, bssid); > } > > - > static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) > { > struct cfg80211_registered_device *rdev; > @@ -2244,6 +2246,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, > struct genl_info *info) > if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && > info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { > u32 tx_ant, rx_ant; > + > if ((!rdev->wiphy.available_antennas_tx && > !rdev->wiphy.available_antennas_rx) || > !rdev->ops->set_antenna) > @@ -2910,6 +2913,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct > genl_info *info) > pairwise = !!mac_addr; > if (info->attrs[NL80211_ATTR_KEY_TYPE]) { > u32 kt = nla_get_u32(info->attrs[NL80211_ATTR_KEY_TYPE]); > + > if (kt >= NUM_NL80211_KEYTYPES) > return -EINVAL; > if (kt != NL80211_KEYTYPE_GROUP && > @@ -3949,7 +3953,6 @@ static int nl80211_dump_station(struct sk_buff *skb, > sta_idx++; > } > > - > out: > cb->args[2] = sta_idx; > err = skb->len; > @@ -4742,7 +4745,6 @@ static int nl80211_dump_mpath(struct sk_buff *skb, > path_idx++; > } > > - > out: > cb->args[2] = path_idx; > err = skb->len; > @@ -5032,7 +5034,6 @@ static int nl80211_req_set_reg(struct sk_buff *skb, > struct genl_info *info) > enum nl80211_user_reg_hint_type user_reg_hint_type; > u32 owner_nlportid; > > - > /* You should only get this when cfg80211 hasn't yet initialized > * completely when built-in to the kernel right between the time > * window between nl80211_init() and regulatory_init(), if that is > @@ -5240,7 +5241,6 @@ do { > \ > } \ > } while (0) > > - > if (!info->attrs[NL80211_ATTR_MESH_CONFIG]) > return -EINVAL; > if (nla_parse_nested(tb, NL80211_MESHCONF_ATTR_MAX, > @@ -5388,7 +5388,6 @@ static int nl80211_parse_mesh_setup(struct genl_info > *info, > IEEE80211_PATH_METRIC_VENDOR : > IEEE80211_PATH_METRIC_AIRTIME; > > - > if (tb[NL80211_MESH_SETUP_IE]) { > struct nlattr *ieattr = > tb[NL80211_MESH_SETUP_IE]; > @@ -6009,6 +6008,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, > struct genl_info *info) > /* all channels */ > for (band = 0; band < NUM_NL80211_BANDS; band++) { > int j; > + > if (!wiphy->bands[band]) > continue; > for (j = 0; j <
[PATCH 2/3] nl80211: Fix checkpatch warnings about blank lines
This patch fixes the following checkpatch.pl issues - - Please don't use multiple blank lines - Blank lines aren't necessary before a close brace - Missing a blank line after declarations Signed-off-by: Kirtika Ruchandani--- net/wireless/nl80211.c | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 50a0de0..cd422bd 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -167,6 +167,7 @@ __cfg80211_rdev_from_attrs(struct net *netns, struct nlattr **attrs) if (attrs[NL80211_ATTR_IFINDEX]) { int ifindex = nla_get_u32(attrs[NL80211_ATTR_IFINDEX]); + netdev = __dev_get_by_index(netns, ifindex); if (netdev) { if (netdev->ieee80211_ptr) @@ -730,6 +731,7 @@ static int nl80211_parse_key_new(struct nlattr *key, struct key_parse *k) if (tb[NL80211_KEY_DEFAULT_TYPES]) { struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES]; + err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1, tb[NL80211_KEY_DEFAULT_TYPES], nl80211_key_default_policy); @@ -1381,6 +1383,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, rdev->ops->get_antenna) { u32 tx_ant = 0, rx_ant = 0; int res; + res = rdev_get_antenna(rdev, _ant, _ant); if (!res) { if (nla_put_u32(msg, @@ -2111,7 +2114,6 @@ static int nl80211_set_wds_peer(struct sk_buff *skb, struct genl_info *info) return rdev_set_wds_peer(rdev, dev, bssid); } - static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev; @@ -2244,6 +2246,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { u32 tx_ant, rx_ant; + if ((!rdev->wiphy.available_antennas_tx && !rdev->wiphy.available_antennas_rx) || !rdev->ops->set_antenna) @@ -2910,6 +2913,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) pairwise = !!mac_addr; if (info->attrs[NL80211_ATTR_KEY_TYPE]) { u32 kt = nla_get_u32(info->attrs[NL80211_ATTR_KEY_TYPE]); + if (kt >= NUM_NL80211_KEYTYPES) return -EINVAL; if (kt != NL80211_KEYTYPE_GROUP && @@ -3949,7 +3953,6 @@ static int nl80211_dump_station(struct sk_buff *skb, sta_idx++; } - out: cb->args[2] = sta_idx; err = skb->len; @@ -4742,7 +4745,6 @@ static int nl80211_dump_mpath(struct sk_buff *skb, path_idx++; } - out: cb->args[2] = path_idx; err = skb->len; @@ -5032,7 +5034,6 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info) enum nl80211_user_reg_hint_type user_reg_hint_type; u32 owner_nlportid; - /* You should only get this when cfg80211 hasn't yet initialized * completely when built-in to the kernel right between the time * window between nl80211_init() and regulatory_init(), if that is @@ -5240,7 +5241,6 @@ do { \ } \ } while (0) - if (!info->attrs[NL80211_ATTR_MESH_CONFIG]) return -EINVAL; if (nla_parse_nested(tb, NL80211_MESHCONF_ATTR_MAX, @@ -5388,7 +5388,6 @@ static int nl80211_parse_mesh_setup(struct genl_info *info, IEEE80211_PATH_METRIC_VENDOR : IEEE80211_PATH_METRIC_AIRTIME; - if (tb[NL80211_MESH_SETUP_IE]) { struct nlattr *ieattr = tb[NL80211_MESH_SETUP_IE]; @@ -6009,6 +6008,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) /* all channels */ for (band = 0; band < NUM_NL80211_BANDS; band++) { int j; + if (!wiphy->bands[band]) continue; for (j = 0; j < wiphy->bands[band]->n_channels; j++) { @@ -6412,6 +6412,7 @@ nl80211_parse_sched_scan(struct wiphy *wiphy, struct wireless_dev *wdev, /* all channels */ for (band = 0; band < NUM_NL80211_BANDS; band++) { int j; + if (!wiphy->bands[band]) continue; for (j = 0; j < wiphy->bands[band]->n_channels; j++) { @@