mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 17:01:44 +04:00
realtek: refresh patches
Make the patches apply cleanly again. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/sfp.c
|
--- a/drivers/net/phy/sfp.c
|
||||||
+++ b/drivers/net/phy/sfp.c
|
+++ b/drivers/net/phy/sfp.c
|
||||||
@@ -866,6 +866,29 @@ static int sfp_i2c_mdiobus_create(struct
|
@@ -850,6 +850,29 @@ static int sfp_i2c_mdiobus_create(struct
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
|||||||
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
|
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
|
||||||
{
|
{
|
||||||
mdiobus_unregister(sfp->i2c_mii);
|
mdiobus_unregister(sfp->i2c_mii);
|
||||||
@@ -2040,9 +2063,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
@@ -2024,9 +2047,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
||||||
|
|
||||||
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
|
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/sfp.c
|
--- a/drivers/net/phy/sfp.c
|
||||||
+++ b/drivers/net/phy/sfp.c
|
+++ b/drivers/net/phy/sfp.c
|
||||||
@@ -825,21 +825,29 @@ static int sfp_smbus_byte_write(struct s
|
@@ -809,21 +809,29 @@ static int sfp_smbus_byte_write(struct s
|
||||||
|
|
||||||
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
|
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
|
|||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
|
|
||||||
#include "sfp.h"
|
#include "sfp.h"
|
||||||
@@ -774,50 +775,101 @@ static int sfp_i2c_write(struct sfp *sfp
|
@@ -758,50 +759,101 @@ static int sfp_i2c_write(struct sfp *sfp
|
||||||
return ret == ARRAY_SIZE(msgs) ? len : 0;
|
return ret == ARRAY_SIZE(msgs) ? len : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,7 +164,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
|
|||||||
}
|
}
|
||||||
|
|
||||||
return data - (u8 *)buf;
|
return data - (u8 *)buf;
|
||||||
@@ -826,17 +878,32 @@ static int sfp_smbus_byte_write(struct s
|
@@ -810,17 +862,32 @@ static int sfp_smbus_byte_write(struct s
|
||||||
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
|
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
|
||||||
{
|
{
|
||||||
size_t max_block_size;
|
size_t max_block_size;
|
||||||
|
|||||||
Reference in New Issue
Block a user