Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
187d091
Added Traffic Control Layer
natale-p Oct 7, 2015
eb9a024
Internet depends on traffic-control
natale-p Oct 7, 2015
262931f
Made public ProtocolHandlerEntry struct in node.h
natale-p Oct 7, 2015
80baa0f
Aggregate TrafficControlLayer on any Internet-enabled node
natale-p Oct 7, 2015
9285b11
Aggregate TCLayer by default on tests
natale-p Oct 7, 2015
cbafa49
Register callbacks on TCLayer and NetDevices, RX side
natale-p Oct 7, 2015
11f20e7
Use traffic-control to send packets
natale-p Oct 7, 2015
0c814e4
Initial support for multiple transmission queues inside NetDevices
stavallo Nov 19, 2015
ef2c685
WifiNetDevices can return the number of transmission queues based on …
stavallo Nov 19, 2015
bb27480
Flow control Part I: NetDeviceQueues can be started, stopped and woken
stavallo Oct 20, 2015
610f9c7
PointToPointNetDevice: Add support for flow control
stavallo Nov 12, 2015
251787d
NetDevices return the index of the transmission queue they select for…
stavallo Nov 20, 2015
bd130e8
Make Queue store QueueItem objects
stavallo Jan 5, 2016
2bf15fb
Add the QueueDisc base class
stavallo Oct 23, 2015
6e6ba99
The traffic control layer enqueues packets in the queue disc
stavallo Dec 4, 2015
4dd14d5
Defer the addition of the IP header until the packet is extracted fro…
stavallo Jan 6, 2016
9881fe5
Ipv4Header: Add GetVersion and make DscpTypeToString static
stavallo Jan 8, 2016
106f8f2
Add the pfifo_fast queue disc
stavallo Jan 9, 2016
7d99326
Add a queue disc helper to ease the installation of queue discs
stavallo Dec 2, 2015
d850946
Add a traffic control example
pasquimp Nov 25, 2015
0815e6b
Add a pfifo_fast test suite
pasquimp Dec 14, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WifiNetDevices can return the number of transmission queues based on …
…the installed MAC

For WifiNetDevices, the number of transmission queues is set when installing the MAC (in
WifiNetDevice::SetMac), given that the number of queues is 4 if the MAC supports
QoS and 1 otherwise.
  • Loading branch information
stavallo committed Jan 15, 2016
commit ef2c6859ce3ae6eedf2aad72b5f71ecbba8f872a
9 changes: 9 additions & 0 deletions src/wifi/model/regular-wifi-mac.cc
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,15 @@ RegularWifiMac::GetSsid (void) const
return m_ssid;
}

uint8_t
RegularWifiMac::GetTxQueuesN (void) const
{
if (m_qosSupported)
return 4;

return 1;
}

void
RegularWifiMac::SetBssid (Mac48Address bssid)
{
Expand Down
4 changes: 4 additions & 0 deletions src/wifi/model/regular-wifi-mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ class RegularWifiMac : public WifiMac
* \return the ssid which this MAC layer is going to try to stay in.
*/
virtual Ssid GetSsid (void) const;
/**
* \return the number of transmission queues handled by this MAC layer.
*/
virtual uint8_t GetTxQueuesN (void) const;
/**
* \param address the current address of this MAC layer.
*/
Expand Down
4 changes: 4 additions & 0 deletions src/wifi/model/wifi-mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ class WifiMac : public Object
* \return the ssid which this MAC layer is going to try to stay in.
*/
virtual Ssid GetSsid (void) const = 0;
/**
* \return the number of transmission queues handled by this MAC layer.
*/
virtual uint8_t GetTxQueuesN (void) const = 0;
/**
* \param address the current address of this MAC layer.
*/
Expand Down
1 change: 1 addition & 0 deletions src/wifi/model/wifi-net-device.cc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ void
WifiNetDevice::SetMac (Ptr<WifiMac> mac)
{
m_mac = mac;
SetTxQueuesN (m_mac->GetTxQueuesN ());
CompleteConfig ();
}

Expand Down