diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
| commit | 4ca24c3b9f9a828d7c951844ceec88e8699550ad (patch) | |
| tree | 8e5e934452d19558913c147166d0379ee718d61f /qlcnic_sysfs.patch | |
| parent | 5a4549f7ebf22787b2a76908ba90598e453d4a15 (diff) | |
| download | patches-4ca24c3b9f9a828d7c951844ceec88e8699550ad.tar.gz | |
update patches based on 5.11-rc1
Diffstat (limited to 'qlcnic_sysfs.patch')
| -rw-r--r-- | qlcnic_sysfs.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index d9ef05c4062d07..a3c5a94e529c1e 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 -@@ -33,9 +33,9 @@ int qlcnicvf_config_led(struct qlcnic_ad +@@ -32,9 +32,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; -@@ -57,9 +57,8 @@ err_out: +@@ -56,9 +56,8 @@ err_out: return ret; } @@ -29,7 +29,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int bridged_mode = 0; -@@ -69,10 +68,11 @@ static ssize_t qlcnic_show_bridged_mode( +@@ -68,10 +67,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; -@@ -86,12 +86,13 @@ static ssize_t qlcnic_store_diag_mode(st +@@ -85,12 +85,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) -@@ -212,9 +213,8 @@ out: +@@ -211,9 +212,8 @@ out: return err; } @@ -72,7 +72,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int err = 0; -@@ -235,8 +235,8 @@ static ssize_t qlcnic_store_beacon(struc +@@ -234,8 +234,8 @@ static ssize_t qlcnic_store_beacon(struc return err; } @@ -83,7 +83,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); -@@ -264,6 +264,7 @@ static int qlcnic_sysfs_validate_crb(str +@@ -263,6 +263,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, -@@ -1176,24 +1177,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w +@@ -1175,24 +1176,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,7 +116,7 @@ static const struct bin_attribute bin_attr_crb = { .attr = { .name = "crb", .mode = 0644 }, .size = 0, -@@ -1319,6 +1302,24 @@ void qlcnic_unregister_hwmon_dev(struct +@@ -1318,6 +1301,24 @@ void qlcnic_unregister_hwmon_dev(struct } #endif @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1332,6 +1333,11 @@ void qlcnic_create_sysfs_entries(struct +@@ -1331,6 +1332,11 @@ void qlcnic_create_sysfs_entries(struct void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; |