aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2013-04-04 02:32:12 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-08 12:00:16 -0400
commitd87c8c6d1562f12df101c5b9857170d110e7353a (patch)
tree9a4ca0a9baeb201215e10297955ce25b431870b0
parent6b0ee8c036ecb3ac92e18e6ca0dca7bff88beaf0 (diff)
IEEE 802.15.4: remove get_bsn from "struct ieee802154_mlme_ops"
It served no purpose: we never call it from anywhere in the stack and the only driver that did implement it (fakehard) merely provided a dummy value. There is also considerable doubt whether it would make sense to even attempt beacon processing at this level in the Linux kernel. Signed-off-by: Werner Almesberger <werner@almesberger.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ieee802154/fakehard.c21
-rw-r--r--include/net/ieee802154_netdev.h1
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
index 8f1c25676d44..bf0d55e2dd63 100644
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
@@ -106,26 +106,6 @@ static u8 fake_get_dsn(const struct net_device *dev)
106} 106}
107 107
108/** 108/**
109 * fake_get_bsn - Retrieve the BSN of the device.
110 * @dev: The network device to retrieve the BSN for.
111 *
112 * Returns the IEEE 802.15.4 BSN for the network device.
113 * The BSN is the sequence number which will be added to each
114 * beacon frame sent by the MAC.
115 *
116 * BSN means 'Beacon Sequence Number'.
117 *
118 * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
119 * document.
120 */
121static u8 fake_get_bsn(const struct net_device *dev)
122{
123 BUG_ON(dev->type != ARPHRD_IEEE802154);
124
125 return 0x00; /* BSN are implemented in HW, so return just 0 */
126}
127
128/**
129 * fake_assoc_req - Make an association request to the HW. 109 * fake_assoc_req - Make an association request to the HW.
130 * @dev: The network device which we are associating to a network. 110 * @dev: The network device which we are associating to a network.
131 * @addr: The coordinator with which we wish to associate. 111 * @addr: The coordinator with which we wish to associate.
@@ -264,7 +244,6 @@ static struct ieee802154_mlme_ops fake_mlme = {
264 .get_pan_id = fake_get_pan_id, 244 .get_pan_id = fake_get_pan_id,
265 .get_short_addr = fake_get_short_addr, 245 .get_short_addr = fake_get_short_addr,
266 .get_dsn = fake_get_dsn, 246 .get_dsn = fake_get_dsn,
267 .get_bsn = fake_get_bsn,
268}; 247};
269 248
270static int ieee802154_fake_open(struct net_device *dev) 249static int ieee802154_fake_open(struct net_device *dev)
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index d104c882fc29..642f94c0fa2f 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -110,7 +110,6 @@ struct ieee802154_mlme_ops {
110 u16 (*get_pan_id)(const struct net_device *dev); 110 u16 (*get_pan_id)(const struct net_device *dev);
111 u16 (*get_short_addr)(const struct net_device *dev); 111 u16 (*get_short_addr)(const struct net_device *dev);
112 u8 (*get_dsn)(const struct net_device *dev); 112 u8 (*get_dsn)(const struct net_device *dev);
113 u8 (*get_bsn)(const struct net_device *dev);
114}; 113};
115 114
116/* The IEEE 802.15.4 standard defines 2 type of the devices: 115/* The IEEE 802.15.4 standard defines 2 type of the devices: