Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/ieee802154: Remove and add extra blank lines as needed.

Browse source 
Some have been missing and some have been needed. Just cosmetics.

Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Stefan Schmidt 2014-12-04 11:51:59 +01:00 • committed by Marcel Holtmann
parent cad865dc4b
commit 6c10dc05b8
7 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/ieee802154/6lowpan_rtnl.c
View file

@ -439,7 +439,6 @@ static void lowpan_set_lockdep_class_one(struct net_device *dev,
&lowpan_netdev_xmit_lock_key); &lowpan_netdev_xmit_lock_key);
} }
static int lowpan_dev_init(struct net_device *dev) static int lowpan_dev_init(struct net_device *dev)
{ {
netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL); netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL);

4
net/ieee802154/af_ieee802154.c
View file

@ -99,6 +99,7 @@ static int ieee802154_sock_release(struct socket *sock)
} }
return 0; return 0;
} }
static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock, static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t len) struct msghdr *msg, size_t len)
{ {
@ -231,7 +232,6 @@ static const struct proto_ops ieee802154_dgram_ops = {
#endif #endif
}; };
/* Create a socket. Initialise the socket, blank the addresses /* Create a socket. Initialise the socket, blank the addresses
* set the state. * set the state.
*/ */
@ -320,7 +320,6 @@ drop:
return NET_RX_DROP; return NET_RX_DROP;
} }
static struct packet_type ieee802154_packet_type = { static struct packet_type ieee802154_packet_type = {
.type = htons(ETH_P_IEEE802154), .type = htons(ETH_P_IEEE802154),
.func = ieee802154_rcv, .func = ieee802154_rcv,
@ -354,6 +353,7 @@ err_dgram:
out: out:
return rc; return rc;
} }
static void __exit af_ieee802154_remove(void) static void __exit af_ieee802154_remove(void)
{ {
dev_remove_pack(&ieee802154_packet_type); dev_remove_pack(&ieee802154_packet_type);

1
net/ieee802154/dgram.c
View file

@ -154,7 +154,6 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)
spin_unlock_bh(&sk->sk_receive_queue.lock); spin_unlock_bh(&sk->sk_receive_queue.lock);
return put_user(amount, (int __user *)arg); return put_user(amount, (int __user *)arg);
} }
} }
return -ENOIOCTLCMD; return -ENOIOCTLCMD;

1
net/ieee802154/netlink.c
View file

@ -147,7 +147,6 @@ static const struct genl_multicast_group ieee802154_mcgrps[] = {
[IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, }, [IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, },
}; };
int __init ieee802154_nl_init(void) int __init ieee802154_nl_init(void)
{ {
return genl_register_family_with_ops_groups(&nl802154_family, return genl_register_family_with_ops_groups(&nl802154_family,

14
net/ieee802154/nl-mac.c
View file

@ -346,7 +346,6 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)
else else
page = 0; page = 0;
if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) { if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) {
ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS); ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS);
dev_put(dev); dev_put(dev);
@ -397,7 +396,6 @@ int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info)
else else
page = 0; page = 0;
ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels, ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels,
page, duration); page, duration);
@ -548,8 +546,6 @@ out:
return rc; return rc;
} }
static int static int
ieee802154_llsec_parse_key_id(struct genl_info *info, ieee802154_llsec_parse_key_id(struct genl_info *info,
struct ieee802154_llsec_key_id *desc) struct ieee802154_llsec_key_id *desc)
@ -765,8 +761,6 @@ out:
return rc; return rc;
} }
struct llsec_dump_data { struct llsec_dump_data {
struct sk_buff *skb; struct sk_buff *skb;
int s_idx, s_idx2; int s_idx, s_idx2;
@ -843,8 +837,6 @@ ieee802154_nl_llsec_change(struct sk_buff *skb, struct genl_info *info,
return rc; return rc;
} }
static int static int
ieee802154_llsec_parse_key(struct genl_info *info, ieee802154_llsec_parse_key(struct genl_info *info,
struct ieee802154_llsec_key *key) struct ieee802154_llsec_key *key)
@ -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); return ieee802154_llsec_dump_table(skb, cb, llsec_iter_keys);
} }
static int static int
llsec_parse_dev(struct genl_info *info, llsec_parse_dev(struct genl_info *info,
struct ieee802154_llsec_device *dev) struct ieee802154_llsec_device *dev)
@ -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); return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devs);
} }
static int llsec_add_devkey(struct net_device *dev, struct genl_info *info) static int llsec_add_devkey(struct net_device *dev, struct genl_info *info)
{ {
struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev);
@ -1237,8 +1225,6 @@ int ieee802154_llsec_dump_devkeys(struct sk_buff *skb,
return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys); return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys);
} }
static int static int
llsec_parse_seclevel(struct genl_info *info, llsec_parse_seclevel(struct genl_info *info,
struct ieee802154_llsec_seclevel *sl) struct ieee802154_llsec_seclevel *sl)

1
net/ieee802154/nl-phy.c
View file

@ -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') if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0')
return -EINVAL; /* phy name should be null-terminated */ return -EINVAL; /* phy name should be null-terminated */
phy = wpan_phy_find(name); phy = wpan_phy_find(name);
if (!phy) if (!phy)
return -ENODEV; return -ENODEV;

1
net/ieee802154/raw.c
View file

@ -221,7 +221,6 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
} }
void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb)
{ {
struct sock *sk; struct sock *sk;