diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /drivers/net/bonding/bond_sysfs.c | |
parent | 6d5eba5aac4ec9bba3d6b3e6425d857706d12ccb (diff) | |
parent | 39edac70e9aedf451fccaa851b273ace9fcca0bd (diff) | |
download | blackbird-obmc-linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.gz blackbird-obmc-linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index eeab40b01b7a..c29b836749b6 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1699,6 +1699,44 @@ out: static DEVICE_ATTR(resend_igmp, S_IRUGO | S_IWUSR, bonding_show_resend_igmp, bonding_store_resend_igmp); + +static ssize_t bonding_show_lp_interval(struct device *d, + struct device_attribute *attr, + char *buf) +{ + struct bonding *bond = to_bond(d); + return sprintf(buf, "%d\n", bond->params.lp_interval); +} + +static ssize_t bonding_store_lp_interval(struct device *d, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct bonding *bond = to_bond(d); + int new_value, ret = count; + + if (sscanf(buf, "%d", &new_value) != 1) { + pr_err("%s: no lp interval value specified.\n", + bond->dev->name); + ret = -EINVAL; + goto out; + } + + if (new_value <= 0) { + pr_err ("%s: lp_interval must be between 1 and %d\n", + bond->dev->name, INT_MAX); + ret = -EINVAL; + goto out; + } + + bond->params.lp_interval = new_value; +out: + return ret; +} + +static DEVICE_ATTR(lp_interval, S_IRUGO | S_IWUSR, + bonding_show_lp_interval, bonding_store_lp_interval); + static struct attribute *per_bond_attrs[] = { &dev_attr_slaves.attr, &dev_attr_mode.attr, @@ -1729,6 +1767,7 @@ static struct attribute *per_bond_attrs[] = { &dev_attr_all_slaves_active.attr, &dev_attr_resend_igmp.attr, &dev_attr_min_links.attr, + &dev_attr_lp_interval.attr, NULL, }; |