diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 11:06:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 11:06:03 -0700 |
| commit | 482878a1a7758221a34413944e9139104ed487ee (patch) | |
| tree | ef430810f4d7f89a95852b11f29f1449a48f5033 /qlcnic_sysfs.patch | |
| parent | 210d894ff19726f6463e0fc1afbb3f6662d18e33 (diff) | |
| download | patches-482878a1a7758221a34413944e9139104ed487ee.tar.gz | |
kdbus and pci patches added
Diffstat (limited to 'qlcnic_sysfs.patch')
| -rw-r--r-- | qlcnic_sysfs.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index f83705f15fd035..5d5f0529852f71 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -4,7 +4,7 @@ --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c -@@ -32,9 +32,9 @@ int qlcnicvf_config_led(struct qlcnic_ad +@@ -36,9 +36,9 @@ int qlcnicvf_config_led(struct qlcnic_ad return -EOPNOTSUPP; } @@ -17,7 +17,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); unsigned long new; -@@ -56,9 +56,8 @@ err_out: +@@ -60,9 +60,8 @@ err_out: return ret; } @@ -29,7 +29,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int bridged_mode = 0; -@@ -68,10 +67,11 @@ static ssize_t qlcnic_show_bridged_mode( +@@ -72,10 +71,11 @@ static ssize_t qlcnic_show_bridged_mode( return sprintf(buf, "%d\n", bridged_mode); } @@ -44,7 +44,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); unsigned long new; -@@ -85,12 +85,13 @@ static ssize_t qlcnic_store_diag_mode(st +@@ -89,12 +89,13 @@ static ssize_t qlcnic_store_diag_mode(st return len; } @@ -60,7 +60,7 @@ static int qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state, u8 *rate) -@@ -211,9 +212,8 @@ out: +@@ -215,9 +216,8 @@ out: return err; } @@ -72,7 +72,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int err = 0; -@@ -234,8 +234,8 @@ static ssize_t qlcnic_store_beacon(struc +@@ -238,8 +238,8 @@ static ssize_t qlcnic_store_beacon(struc return err; } @@ -83,7 +83,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); -@@ -263,6 +263,7 @@ static int qlcnic_sysfs_validate_crb(str +@@ -267,6 +267,7 @@ static int qlcnic_sysfs_validate_crb(str return 0; } @@ -91,7 +91,7 @@ static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, -@@ -1162,24 +1163,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w +@@ -1182,24 +1183,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,9 +116,9 @@ static struct bin_attribute bin_attr_crb = { .attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)}, .size = 0, -@@ -1243,6 +1226,24 @@ static struct bin_attribute bin_attr_fla - .write = qlcnic_83xx_sysfs_flash_write_handler, - }; +@@ -1325,6 +1308,24 @@ void qlcnic_unregister_hwmon_dev(struct + } + #endif +static struct attribute *qlcnic_attrs[] = { + &dev_attr_diag_mode.attr, @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1256,6 +1257,11 @@ void qlcnic_create_sysfs_entries(struct +@@ -1338,6 +1339,11 @@ void qlcnic_create_sysfs_entries(struct void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; |