/
0014-mac802154-remove-unnecessary-spinlocks.patch
54 lines (44 loc) · 1.5 KB
/
0014-mac802154-remove-unnecessary-spinlocks.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From be81648ca1c38cfa31fab40dd3732a34e8a7bac9 Mon Sep 17 00:00:00 2001
From: Tony Cheneau <tony.cheneau@amnesiak.org>
Date: Thu, 20 Sep 2012 23:44:19 -0400
Subject: [PATCH 14/16] mac802154: remove unnecessary spinlocks
These spinlock protects an int variable, that is always accessible in an
atomic fashion.
Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org>
---
net/mac802154/mib.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index f47781a..2339f8d 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -103,15 +103,10 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)
u16 mac802154_dev_get_short_addr(const struct net_device *dev)
{
struct mac802154_sub_if_data *priv = netdev_priv(dev);
- u16 ret;
BUG_ON(dev->type != ARPHRD_IEEE802154);
- spin_lock_bh(&priv->mib_lock);
- ret = priv->short_addr;
- spin_unlock_bh(&priv->mib_lock);
-
- return ret;
+ return priv->short_addr;
}
void mac802154_dev_set_ieee_addr(struct net_device *dev)
@@ -131,15 +126,10 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)
u16 mac802154_dev_get_pan_id(const struct net_device *dev)
{
struct mac802154_sub_if_data *priv = netdev_priv(dev);
- u16 ret;
BUG_ON(dev->type != ARPHRD_IEEE802154);
- spin_lock_bh(&priv->mib_lock);
- ret = priv->pan_id;
- spin_unlock_bh(&priv->mib_lock);
-
- return ret;
+ return priv->pan_id;
}
void mac802154_dev_set_pan_id(struct net_device *dev, u16 val)
--
1.7.7.6