diff options
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 3 | ||||
-rw-r--r-- | net/ieee802154/af_ieee802154.c | 4 | ||||
-rw-r--r-- | net/ieee802154/dgram.c | 1 | ||||
-rw-r--r-- | net/ieee802154/netlink.c | 5 | ||||
-rw-r--r-- | net/ieee802154/nl-mac.c | 16 | ||||
-rw-r--r-- | net/ieee802154/nl-phy.c | 3 | ||||
-rw-r--r-- | net/ieee802154/raw.c | 1 |
7 files changed, 7 insertions, 26 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index 290e14f2e92e..27eaa65e88e1 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c | |||
@@ -439,7 +439,6 @@ static void lowpan_set_lockdep_class_one(struct net_device *dev, | |||
439 | &lowpan_netdev_xmit_lock_key); | 439 | &lowpan_netdev_xmit_lock_key); |
440 | } | 440 | } |
441 | 441 | ||
442 | |||
443 | static int lowpan_dev_init(struct net_device *dev) | 442 | static int lowpan_dev_init(struct net_device *dev) |
444 | { | 443 | { |
445 | netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL); | 444 | netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL); |
@@ -597,7 +596,7 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev, | |||
597 | 596 | ||
598 | entry->ldev = dev; | 597 | entry->ldev = dev; |
599 | 598 | ||
600 | /* Set the lowpan harware address to the wpan hardware address. */ | 599 | /* Set the lowpan hardware address to the wpan hardware address. */ |
601 | memcpy(dev->dev_addr, real_dev->dev_addr, IEEE802154_ADDR_LEN); | 600 | memcpy(dev->dev_addr, real_dev->dev_addr, IEEE802154_ADDR_LEN); |
602 | 601 | ||
603 | mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx); | 602 | mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx); |
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index 26da1e179737..d0a1282cdf43 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c | |||
@@ -99,6 +99,7 @@ static int ieee802154_sock_release(struct socket *sock) | |||
99 | } | 99 | } |
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | |||
102 | static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | 103 | static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock, |
103 | struct msghdr *msg, size_t len) | 104 | struct msghdr *msg, size_t len) |
104 | { | 105 | { |
@@ -231,7 +232,6 @@ static const struct proto_ops ieee802154_dgram_ops = { | |||
231 | #endif | 232 | #endif |
232 | }; | 233 | }; |
233 | 234 | ||
234 | |||
235 | /* Create a socket. Initialise the socket, blank the addresses | 235 | /* Create a socket. Initialise the socket, blank the addresses |
236 | * set the state. | 236 | * set the state. |
237 | */ | 237 | */ |
@@ -320,7 +320,6 @@ drop: | |||
320 | return NET_RX_DROP; | 320 | return NET_RX_DROP; |
321 | } | 321 | } |
322 | 322 | ||
323 | |||
324 | static struct packet_type ieee802154_packet_type = { | 323 | static struct packet_type ieee802154_packet_type = { |
325 | .type = htons(ETH_P_IEEE802154), | 324 | .type = htons(ETH_P_IEEE802154), |
326 | .func = ieee802154_rcv, | 325 | .func = ieee802154_rcv, |
@@ -354,6 +353,7 @@ err_dgram: | |||
354 | out: | 353 | out: |
355 | return rc; | 354 | return rc; |
356 | } | 355 | } |
356 | |||
357 | static void __exit af_ieee802154_remove(void) | 357 | static void __exit af_ieee802154_remove(void) |
358 | { | 358 | { |
359 | dev_remove_pack(&ieee802154_packet_type); | 359 | dev_remove_pack(&ieee802154_packet_type); |
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 2c7a93e7167e..d1930b70c4aa 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c | |||
@@ -154,7 +154,6 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg) | |||
154 | spin_unlock_bh(&sk->sk_receive_queue.lock); | 154 | spin_unlock_bh(&sk->sk_receive_queue.lock); |
155 | return put_user(amount, (int __user *)arg); | 155 | return put_user(amount, (int __user *)arg); |
156 | } | 156 | } |
157 | |||
158 | } | 157 | } |
159 | 158 | ||
160 | return -ENOIOCTLCMD; | 159 | return -ENOIOCTLCMD; |
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c index 63ee7d66950e..fa1464762d0d 100644 --- a/net/ieee802154/netlink.c +++ b/net/ieee802154/netlink.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Netlink inteface for IEEE 802.15.4 stack | 2 | * Netlink interface for IEEE 802.15.4 stack |
3 | * | 3 | * |
4 | * Copyright 2007, 2008 Siemens AG | 4 | * Copyright 2007, 2008 Siemens AG |
5 | * | 5 | * |
@@ -73,7 +73,7 @@ out: | |||
73 | } | 73 | } |
74 | 74 | ||
75 | struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info, | 75 | struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info, |
76 | int flags, u8 req) | 76 | int flags, u8 req) |
77 | { | 77 | { |
78 | void *hdr; | 78 | void *hdr; |
79 | struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); | 79 | struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); |
@@ -147,7 +147,6 @@ static const struct genl_multicast_group ieee802154_mcgrps[] = { | |||
147 | [IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, }, | 147 | [IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, }, |
148 | }; | 148 | }; |
149 | 149 | ||
150 | |||
151 | int __init ieee802154_nl_init(void) | 150 | int __init ieee802154_nl_init(void) |
152 | { | 151 | { |
153 | return genl_register_family_with_ops_groups(&nl802154_family, | 152 | return genl_register_family_with_ops_groups(&nl802154_family, |
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index fe77f0c770b8..cd919493c976 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Netlink inteface for IEEE 802.15.4 stack | 2 | * Netlink interface for IEEE 802.15.4 stack |
3 | * | 3 | * |
4 | * Copyright 2007, 2008 Siemens AG | 4 | * Copyright 2007, 2008 Siemens AG |
5 | * | 5 | * |
@@ -346,7 +346,6 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) | |||
346 | else | 346 | else |
347 | page = 0; | 347 | page = 0; |
348 | 348 | ||
349 | |||
350 | if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) { | 349 | if (addr.short_addr == cpu_to_le16(IEEE802154_ADDR_BROADCAST)) { |
351 | ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS); | 350 | ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS); |
352 | dev_put(dev); | 351 | dev_put(dev); |
@@ -397,7 +396,6 @@ int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) | |||
397 | else | 396 | else |
398 | page = 0; | 397 | page = 0; |
399 | 398 | ||
400 | |||
401 | ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels, | 399 | ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels, |
402 | page, duration); | 400 | page, duration); |
403 | 401 | ||
@@ -548,8 +546,6 @@ out: | |||
548 | return rc; | 546 | return rc; |
549 | } | 547 | } |
550 | 548 | ||
551 | |||
552 | |||
553 | static int | 549 | static int |
554 | ieee802154_llsec_parse_key_id(struct genl_info *info, | 550 | ieee802154_llsec_parse_key_id(struct genl_info *info, |
555 | struct ieee802154_llsec_key_id *desc) | 551 | struct ieee802154_llsec_key_id *desc) |
@@ -765,8 +761,6 @@ out: | |||
765 | return rc; | 761 | return rc; |
766 | } | 762 | } |
767 | 763 | ||
768 | |||
769 | |||
770 | struct llsec_dump_data { | 764 | struct llsec_dump_data { |
771 | struct sk_buff *skb; | 765 | struct sk_buff *skb; |
772 | int s_idx, s_idx2; | 766 | int s_idx, s_idx2; |
@@ -843,8 +837,6 @@ ieee802154_nl_llsec_change(struct sk_buff *skb, struct genl_info *info, | |||
843 | return rc; | 837 | return rc; |
844 | } | 838 | } |
845 | 839 | ||
846 | |||
847 | |||
848 | static int | 840 | static int |
849 | ieee802154_llsec_parse_key(struct genl_info *info, | 841 | ieee802154_llsec_parse_key(struct genl_info *info, |
850 | struct ieee802154_llsec_key *key) | 842 | struct ieee802154_llsec_key *key) |
@@ -989,8 +981,6 @@ int ieee802154_llsec_dump_keys(struct sk_buff *skb, struct netlink_callback *cb) | |||
989 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_keys); | 981 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_keys); |
990 | } | 982 | } |
991 | 983 | ||
992 | |||
993 | |||
994 | static int | 984 | static int |
995 | llsec_parse_dev(struct genl_info *info, | 985 | llsec_parse_dev(struct genl_info *info, |
996 | struct ieee802154_llsec_device *dev) | 986 | struct ieee802154_llsec_device *dev) |
@@ -1121,8 +1111,6 @@ int ieee802154_llsec_dump_devs(struct sk_buff *skb, struct netlink_callback *cb) | |||
1121 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devs); | 1111 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devs); |
1122 | } | 1112 | } |
1123 | 1113 | ||
1124 | |||
1125 | |||
1126 | static int llsec_add_devkey(struct net_device *dev, struct genl_info *info) | 1114 | static int llsec_add_devkey(struct net_device *dev, struct genl_info *info) |
1127 | { | 1115 | { |
1128 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); | 1116 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); |
@@ -1237,8 +1225,6 @@ int ieee802154_llsec_dump_devkeys(struct sk_buff *skb, | |||
1237 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys); | 1225 | return ieee802154_llsec_dump_table(skb, cb, llsec_iter_devkeys); |
1238 | } | 1226 | } |
1239 | 1227 | ||
1240 | |||
1241 | |||
1242 | static int | 1228 | static int |
1243 | llsec_parse_seclevel(struct genl_info *info, | 1229 | llsec_parse_seclevel(struct genl_info *info, |
1244 | struct ieee802154_llsec_seclevel *sl) | 1230 | struct ieee802154_llsec_seclevel *sl) |
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 80a946dddd90..7baf98b14611 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Netlink inteface for IEEE 802.15.4 stack | 2 | * Netlink interface for IEEE 802.15.4 stack |
3 | * | 3 | * |
4 | * Copyright 2007, 2008 Siemens AG | 4 | * Copyright 2007, 2008 Siemens AG |
5 | * | 5 | * |
@@ -94,7 +94,6 @@ int ieee802154_list_phy(struct sk_buff *skb, struct genl_info *info) | |||
94 | if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0') | 94 | if (name[nla_len(info->attrs[IEEE802154_ATTR_PHY_NAME]) - 1] != '\0') |
95 | return -EINVAL; /* phy name should be null-terminated */ | 95 | return -EINVAL; /* phy name should be null-terminated */ |
96 | 96 | ||
97 | |||
98 | phy = wpan_phy_find(name); | 97 | phy = wpan_phy_find(name); |
99 | if (!phy) | 98 | if (!phy) |
100 | return -ENODEV; | 99 | return -ENODEV; |
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 61e9d2972947..1674b115c891 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c | |||
@@ -221,7 +221,6 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) | |||
221 | return NET_RX_SUCCESS; | 221 | return NET_RX_SUCCESS; |
222 | } | 222 | } |
223 | 223 | ||
224 | |||
225 | void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) | 224 | void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) |
226 | { | 225 | { |
227 | struct sock *sk; | 226 | struct sock *sk; |