Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Stefan Schmidt and committed by
Marcel Holtmann
6c10dc05 cad865dc

+2 -21
-1
net/ieee802154/6lowpan_rtnl.c
··· 439 439 &lowpan_netdev_xmit_lock_key); 440 440 } 441 441 442 - 443 442 static int lowpan_dev_init(struct net_device *dev) 444 443 { 445 444 netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL);
+2 -2
net/ieee802154/af_ieee802154.c
··· 99 99 } 100 100 return 0; 101 101 } 102 + 102 103 static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 103 104 struct msghdr *msg, size_t len) 104 105 { ··· 232 231 #endif 233 232 }; 234 233 235 - 236 234 /* Create a socket. Initialise the socket, blank the addresses 237 235 * set the state. 238 236 */ ··· 320 320 return NET_RX_DROP; 321 321 } 322 322 323 - 324 323 static struct packet_type ieee802154_packet_type = { 325 324 .type = htons(ETH_P_IEEE802154), 326 325 .func = ieee802154_rcv, ··· 353 354 out: 354 355 return rc; 355 356 } 357 + 356 358 static void __exit af_ieee802154_remove(void) 357 359 { 358 360 dev_remove_pack(&ieee802154_packet_type);
-1
net/ieee802154/dgram.c
··· 154 154 spin_unlock_bh(&sk->sk_receive_queue.lock); 155 155 return put_user(amount, (int __user *)arg); 156 156 } 157 - 158 157 } 159 158 160 159 return -ENOIOCTLCMD;
-1
net/ieee802154/netlink.c
··· 147 147 [IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, }, 148 148 }; 149 149 150 - 151 150 int __init ieee802154_nl_init(void) 152 151 { 153 152 return genl_register_family_with_ops_groups(&nl802154_family,
-14
net/ieee802154/nl-mac.c
··· 346 346 else 347 347 page = 0; 348 348 349 - 350 349 if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) { 351 350 ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS); 352 351 dev_put(dev); ··· 395 396 page = nla_get_u8(info->attrs[IEEE802154_ATTR_PAGE]); 396 397 else 397 398 page = 0; 398 - 399 399 400 400 ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels, 401 401 page, duration); ··· 545 547 dev_put(dev); 546 548 return rc; 547 549 } 548 - 549 - 550 550 551 551 static int 552 552 ieee802154_llsec_parse_key_id(struct genl_info *info, ··· 761 765 return rc; 762 766 } 763 767 764 - 765 - 766 768 struct llsec_dump_data { 767 769 struct sk_buff *skb; 768 770 int s_idx, s_idx2; ··· 836 842 dev_put(dev); 837 843 return rc; 838 844 } 839 - 840 - 841 845 842 846 static int 843 847 ieee802154_llsec_parse_key(struct genl_info *info, ··· 981 989 return ieee802154_llsec_dump_table(skb, cb, llsec_iter_keys); 982 990 } 983 991 984 - 985 - 986 992 static int 987 993 llsec_parse_dev(struct genl_info *info, 988 994 struct ieee802154_llsec_device *dev) ··· 1111 1121 return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devs); 1112 1122 } 1113 1123 1114 - 1115 - 1116 1124 static int llsec_add_devkey(struct net_device *dev, struct genl_info *info) 1117 1125 { 1118 1126 struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); ··· 1224 1236 { 1225 1237 return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys); 1226 1238 } 1227 - 1228 - 1229 1239 1230 1240 static int 1231 1241 llsec_parse_seclevel(struct genl_info *info,
-1
net/ieee802154/nl-phy.c
··· 94 94 if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0') 95 95 return -EINVAL; /* phy name should be null-terminated */ 96 96 97 - 98 97 phy = wpan_phy_find(name); 99 98 if (!phy) 100 99 return -ENODEV;
-1
net/ieee802154/raw.c
··· 221 221 return NET_RX_SUCCESS; 222 222 } 223 223 224 - 225 224 void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) 226 225 { 227 226 struct sock *sk;