diff options
author | Stefan Schmidt <s.schmidt@samsung.com> | 2014-12-04 05:52:00 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-12-05 06:43:05 -0500 |
commit | a4dc132196ba776d3c34ef91b484e7fa19c0f994 (patch) | |
tree | 84ff37031c0049149871724a52e5868eecabdddd /net/mac802154 | |
parent | 6c10dc05b852c4cefa1b2b2fecc850b2110934e7 (diff) |
net/mac802154: Remove extra blank lines.
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>
Diffstat (limited to 'net/mac802154')
-rw-r--r-- | net/mac802154/llsec.c | 15 | ||||
-rw-r--r-- | net/mac802154/mib.c | 6 |
2 files changed, 0 insertions, 21 deletions
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index fa0d5237c2e0..4a661f7f8d5a 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c | |||
@@ -75,8 +75,6 @@ void mac802154_llsec_destroy(struct mac802154_llsec *sec) | |||
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | |||
79 | |||
80 | int mac802154_llsec_get_params(struct mac802154_llsec *sec, | 78 | int mac802154_llsec_get_params(struct mac802154_llsec *sec, |
81 | struct ieee802154_llsec_params *params) | 79 | struct ieee802154_llsec_params *params) |
82 | { | 80 | { |
@@ -117,8 +115,6 @@ int mac802154_llsec_set_params(struct mac802154_llsec *sec, | |||
117 | return 0; | 115 | return 0; |
118 | } | 116 | } |
119 | 117 | ||
120 | |||
121 | |||
122 | static struct mac802154_llsec_key* | 118 | static struct mac802154_llsec_key* |
123 | llsec_key_alloc(const struct ieee802154_llsec_key *template) | 119 | llsec_key_alloc(const struct ieee802154_llsec_key *template) |
124 | { | 120 | { |
@@ -294,8 +290,6 @@ int mac802154_llsec_key_del(struct mac802154_llsec *sec, | |||
294 | return -ENOENT; | 290 | return -ENOENT; |
295 | } | 291 | } |
296 | 292 | ||
297 | |||
298 | |||
299 | static bool llsec_dev_use_shortaddr(__le16 short_addr) | 293 | static bool llsec_dev_use_shortaddr(__le16 short_addr) |
300 | { | 294 | { |
301 | return short_addr != cpu_to_le16(IEEE802154_ADDR_UNDEF) && | 295 | return short_addr != cpu_to_le16(IEEE802154_ADDR_UNDEF) && |
@@ -411,8 +405,6 @@ int mac802154_llsec_dev_del(struct mac802154_llsec *sec, __le64 device_addr) | |||
411 | return 0; | 405 | return 0; |
412 | } | 406 | } |
413 | 407 | ||
414 | |||
415 | |||
416 | static struct mac802154_llsec_device_key* | 408 | static struct mac802154_llsec_device_key* |
417 | llsec_devkey_find(struct mac802154_llsec_device *dev, | 409 | llsec_devkey_find(struct mac802154_llsec_device *dev, |
418 | const struct ieee802154_llsec_key_id *key) | 410 | const struct ieee802154_llsec_key_id *key) |
@@ -475,8 +467,6 @@ int mac802154_llsec_devkey_del(struct mac802154_llsec *sec, | |||
475 | return 0; | 467 | return 0; |
476 | } | 468 | } |
477 | 469 | ||
478 | |||
479 | |||
480 | static struct mac802154_llsec_seclevel* | 470 | static struct mac802154_llsec_seclevel* |
481 | llsec_find_seclevel(const struct mac802154_llsec *sec, | 471 | llsec_find_seclevel(const struct mac802154_llsec *sec, |
482 | const struct ieee802154_llsec_seclevel *sl) | 472 | const struct ieee802154_llsec_seclevel *sl) |
@@ -532,8 +522,6 @@ int mac802154_llsec_seclevel_del(struct mac802154_llsec *sec, | |||
532 | return 0; | 522 | return 0; |
533 | } | 523 | } |
534 | 524 | ||
535 | |||
536 | |||
537 | static int llsec_recover_addr(struct mac802154_llsec *sec, | 525 | static int llsec_recover_addr(struct mac802154_llsec *sec, |
538 | struct ieee802154_addr *addr) | 526 | struct ieee802154_addr *addr) |
539 | { | 527 | { |
@@ -609,7 +597,6 @@ found: | |||
609 | return llsec_key_get(key); | 597 | return llsec_key_get(key); |
610 | } | 598 | } |
611 | 599 | ||
612 | |||
613 | static void llsec_geniv(u8 iv[16], __le64 addr, | 600 | static void llsec_geniv(u8 iv[16], __le64 addr, |
614 | const struct ieee802154_sechdr *sec) | 601 | const struct ieee802154_sechdr *sec) |
615 | { | 602 | { |
@@ -786,8 +773,6 @@ fail: | |||
786 | return rc; | 773 | return rc; |
787 | } | 774 | } |
788 | 775 | ||
789 | |||
790 | |||
791 | static struct mac802154_llsec_device* | 776 | static struct mac802154_llsec_device* |
792 | llsec_lookup_dev(struct mac802154_llsec *sec, | 777 | llsec_lookup_dev(struct mac802154_llsec *sec, |
793 | const struct ieee802154_addr *addr) | 778 | const struct ieee802154_addr *addr) |
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c index 3596b29ead6b..5cf019a57fd7 100644 --- a/net/mac802154/mib.c +++ b/net/mac802154/mib.c | |||
@@ -104,7 +104,6 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | |||
108 | int mac802154_get_params(struct net_device *dev, | 107 | int mac802154_get_params(struct net_device *dev, |
109 | struct ieee802154_llsec_params *params) | 108 | struct ieee802154_llsec_params *params) |
110 | { | 109 | { |
@@ -136,7 +135,6 @@ int mac802154_set_params(struct net_device *dev, | |||
136 | return res; | 135 | return res; |
137 | } | 136 | } |
138 | 137 | ||
139 | |||
140 | int mac802154_add_key(struct net_device *dev, | 138 | int mac802154_add_key(struct net_device *dev, |
141 | const struct ieee802154_llsec_key_id *id, | 139 | const struct ieee802154_llsec_key_id *id, |
142 | const struct ieee802154_llsec_key *key) | 140 | const struct ieee802154_llsec_key *key) |
@@ -168,7 +166,6 @@ int mac802154_del_key(struct net_device *dev, | |||
168 | return res; | 166 | return res; |
169 | } | 167 | } |
170 | 168 | ||
171 | |||
172 | int mac802154_add_dev(struct net_device *dev, | 169 | int mac802154_add_dev(struct net_device *dev, |
173 | const struct ieee802154_llsec_device *llsec_dev) | 170 | const struct ieee802154_llsec_device *llsec_dev) |
174 | { | 171 | { |
@@ -198,7 +195,6 @@ int mac802154_del_dev(struct net_device *dev, __le64 dev_addr) | |||
198 | return res; | 195 | return res; |
199 | } | 196 | } |
200 | 197 | ||
201 | |||
202 | int mac802154_add_devkey(struct net_device *dev, | 198 | int mac802154_add_devkey(struct net_device *dev, |
203 | __le64 device_addr, | 199 | __le64 device_addr, |
204 | const struct ieee802154_llsec_device_key *key) | 200 | const struct ieee802154_llsec_device_key *key) |
@@ -231,7 +227,6 @@ int mac802154_del_devkey(struct net_device *dev, | |||
231 | return res; | 227 | return res; |
232 | } | 228 | } |
233 | 229 | ||
234 | |||
235 | int mac802154_add_seclevel(struct net_device *dev, | 230 | int mac802154_add_seclevel(struct net_device *dev, |
236 | const struct ieee802154_llsec_seclevel *sl) | 231 | const struct ieee802154_llsec_seclevel *sl) |
237 | { | 232 | { |
@@ -262,7 +257,6 @@ int mac802154_del_seclevel(struct net_device *dev, | |||
262 | return res; | 257 | return res; |
263 | } | 258 | } |
264 | 259 | ||
265 | |||
266 | void mac802154_lock_table(struct net_device *dev) | 260 | void mac802154_lock_table(struct net_device *dev) |
267 | { | 261 | { |
268 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); | 262 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |