mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Cache error code from set-policing.

Browse Source 
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Pravin B Shelar
2012-03-09 12:59:27 -08:00
parent 44445cac40
commit c9f716683d
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/netdev-linux.c
View File

@@ -378,6 +378,7 @@ struct netdev_dev_linux {
0 or an errno value. */
int netdev_mtu_error; /* Cached error code from SIOCGIFMTU or SIOCSIFMTU. */
int ether_addr_error; /* Cached error code from set/get etheraddr. */
int netdev_policing_error; /* Cached error code from set policing. */
struct ethtool_drvinfo drvinfo; /* Cached from ETHTOOL_GDRVINFO. */
struct tc *tc;
@@ -1680,11 +1681,17 @@ netdev_linux_set_policing(struct netdev *netdev,
: !kbits_burst ? 1000 /* Default to 1000 kbits if 0. */
: kbits_burst); /* Stick with user-specified value. */
if (netdev_dev->cache_valid & VALID_POLICING
&& netdev_dev->kbits_rate == kbits_rate
&& netdev_dev->kbits_burst == kbits_burst) {
/* Assume that settings haven't changed since we last set them. */
return 0;
if (netdev_dev->cache_valid & VALID_POLICING) {
if (netdev_dev->netdev_policing_error) {
return netdev_dev->netdev_policing_error;
}
if (netdev_dev->kbits_rate == kbits_rate &&
netdev_dev->kbits_burst == kbits_burst) {
/* Assume that settings haven't changed since we last set them. */
return 0;
}
netdev_dev->cache_valid &= ~VALID_POLICING;
}
COVERAGE_INC(netdev_set_policing);
@@ -1693,7 +1700,7 @@ netdev_linux_set_policing(struct netdev *netdev,
if (error) {
VLOG_WARN_RL(&rl, "%s: removing policing failed: %s",
netdev_name, strerror(error));
return error;
goto out;
}
if (kbits_rate) {
@@ -1701,22 +1708,26 @@ netdev_linux_set_policing(struct netdev *netdev,
if (error) {
VLOG_WARN_RL(&rl, "%s: adding policing qdisc failed: %s",
netdev_name, strerror(error));
return error;
goto out;
}
error = tc_add_policer(netdev, kbits_rate, kbits_burst);
if (error){
VLOG_WARN_RL(&rl, "%s: adding policing action failed: %s",
netdev_name, strerror(error));
return error;
goto out;
}
}
netdev_dev->kbits_rate = kbits_rate;
netdev_dev->kbits_burst = kbits_burst;
netdev_dev->cache_valid |= VALID_POLICING;
return 0;
out:
if (!error || error == ENODEV) {
netdev_dev->netdev_policing_error = error;
netdev_dev->cache_valid |= VALID_POLICING;
}
return error;
}
static int