kernel: bump 4.19 to 4.19.98
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
+MODULE_ALIAS("nf-flow-table-hw");
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5478,6 +5478,13 @@ static int nf_tables_flowtable_parse_hoo
|
||||
@@ -5490,6 +5490,13 @@ static int nf_tables_flowtable_parse_hoo
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
|
||||
if (!ops)
|
||||
return -ENOMEM;
|
||||
@@ -5609,10 +5616,19 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5621,10 +5628,19 @@ static int nf_tables_newflowtable(struct
|
||||
}
|
||||
|
||||
flowtable->data.type = type;
|
||||
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
|
||||
flowtable);
|
||||
if (err < 0)
|
||||
@@ -5738,7 +5754,8 @@ static int nf_tables_fill_flowtable_info
|
||||
@@ -5750,7 +5766,8 @@ static int nf_tables_fill_flowtable_info
|
||||
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
||||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
|
||||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
|
||||
|
||||
@@ -13,17 +13,17 @@ Signed-off-by: Roman Yeryomin <roman@advem.lv>
|
||||
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -46,6 +46,7 @@
|
||||
@@ -44,6 +44,7 @@
|
||||
#define AT803X_FUNC_DATA 0x4003
|
||||
#define AT803X_REG_CHIP_CONFIG 0x1f
|
||||
#define AT803X_BT_BX_REG_SEL 0x8000
|
||||
+#define AT803X_SGMII_ANEG_EN 0x1000
|
||||
|
||||
#define AT803X_PCS_SMART_EEE_CTRL3 0x805D
|
||||
#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3
|
||||
@@ -268,6 +269,27 @@ static int at803x_config_init(struct phy
|
||||
#define AT803X_DEBUG_ADDR 0x1D
|
||||
#define AT803X_DEBUG_DATA 0x1E
|
||||
@@ -252,6 +253,27 @@ static int at803x_probe(struct phy_devic
|
||||
static int at803x_config_init(struct phy_device *phydev)
|
||||
{
|
||||
struct at803x_platform_data *pdata;
|
||||
int ret;
|
||||
+ u32 v;
|
||||
+
|
||||
|
||||
Reference in New Issue
Block a user