Skip to content

Commit

Permalink
net/ieee802154: Remove and add extra blank lines as needed.
Browse files Browse the repository at this point in the history
Some have been missing and some have been needed. Just cosmetics.

Signed-off-by: Stefan Schmidt <[email protected]>
Acked-by: Alexander Aring <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
  • Loading branch information
Stefan-Schmidt authored and holtmann committed Dec 5, 2014
1 parent cad865d commit 6c10dc0
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 21 deletions.
1 change: 0 additions & 1 deletion net/ieee802154/6lowpan_rtnl.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ static void lowpan_set_lockdep_class_one(struct net_device *dev,
&lowpan_netdev_xmit_lock_key);
}


static int lowpan_dev_init(struct net_device *dev)
{
netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL);
Expand Down
4 changes: 2 additions & 2 deletions net/ieee802154/af_ieee802154.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static int ieee802154_sock_release(struct socket *sock)
}
return 0;
}

static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t len)
{
Expand Down Expand Up @@ -231,7 +232,6 @@ static const struct proto_ops ieee802154_dgram_ops = {
#endif
};


/* Create a socket. Initialise the socket, blank the addresses
* set the state.
*/
Expand Down Expand Up @@ -320,7 +320,6 @@ static int ieee802154_rcv(struct sk_buff *skb, struct net_device *dev,
return NET_RX_DROP;
}


static struct packet_type ieee802154_packet_type = {
.type = htons(ETH_P_IEEE802154),
.func = ieee802154_rcv,
Expand Down Expand Up @@ -354,6 +353,7 @@ static int __init af_ieee802154_init(void)
out:
return rc;
}

static void __exit af_ieee802154_remove(void)
{
dev_remove_pack(&ieee802154_packet_type);
Expand Down
1 change: 0 additions & 1 deletion net/ieee802154/dgram.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)
spin_unlock_bh(&sk->sk_receive_queue.lock);
return put_user(amount, (int __user *)arg);
}

}

return -ENOIOCTLCMD;
Expand Down
1 change: 0 additions & 1 deletion net/ieee802154/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ static const struct genl_multicast_group ieee802154_mcgrps[] = {
[IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, },
};


int __init ieee802154_nl_init(void)
{
return genl_register_family_with_ops_groups(&nl802154_family,
Expand Down
14 changes: 0 additions & 14 deletions net/ieee802154/nl-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)
else
page = 0;


if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) {
ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS);
dev_put(dev);
Expand Down Expand Up @@ -397,7 +396,6 @@ int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info)
else
page = 0;


ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels,
page, duration);

Expand Down Expand Up @@ -548,8 +546,6 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info)
return rc;
}



static int
ieee802154_llsec_parse_key_id(struct genl_info *info,
struct ieee802154_llsec_key_id *desc)
Expand Down Expand Up @@ -765,8 +761,6 @@ int ieee802154_llsec_setparams(struct sk_buff *skb, struct genl_info *info)
return rc;
}



struct llsec_dump_data {
struct sk_buff *skb;
int s_idx, s_idx2;
Expand Down Expand Up @@ -843,8 +837,6 @@ ieee802154_nl_llsec_change(struct sk_buff *skb, struct genl_info *info,
return rc;
}



static int
ieee802154_llsec_parse_key(struct genl_info *info,
struct ieee802154_llsec_key *key)
Expand Down Expand Up @@ -989,8 +981,6 @@ int ieee802154_llsec_dump_keys(struct sk_buff *skb, struct netlink_callback *cb)
return ieee802154_llsec_dump_table(skb, cb, llsec_iter_keys);
}



static int
llsec_parse_dev(struct genl_info *info,
struct ieee802154_llsec_device *dev)
Expand Down Expand Up @@ -1121,8 +1111,6 @@ int ieee802154_llsec_dump_devs(struct sk_buff *skb, struct netlink_callback *cb)
return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devs);
}



static int llsec_add_devkey(struct net_device *dev, struct genl_info *info)
{
struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev);
Expand Down Expand Up @@ -1237,8 +1225,6 @@ int ieee802154_llsec_dump_devkeys(struct sk_buff *skb,
return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys);
}



static int
llsec_parse_seclevel(struct genl_info *info,
struct ieee802154_llsec_seclevel *sl)
Expand Down
1 change: 0 additions & 1 deletion net/ieee802154/nl-phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ int ieee802154_list_phy(struct sk_buff *skb, struct genl_info *info)
if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0')
return -EINVAL; /* phy name should be null-terminated */


phy = wpan_phy_find(name);
if (!phy)
return -ENODEV;
Expand Down
1 change: 0 additions & 1 deletion net/ieee802154/raw.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
return NET_RX_SUCCESS;
}


void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb)
{
struct sock *sk;
Expand Down

0 comments on commit 6c10dc0

Please sign in to comment.