diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2022-03-21 15:21:24 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 04:51:38 +0100 |
| commit | 39a7c8d809e7b8f7c4e554a221776b824277989f (patch) | |
| tree | b69d95bd1383089a4e725b57924ba6708650687b /target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch | |
| parent | 49d9d2b2105d3b547dd4ae35a691ed6eec6b4845 (diff) | |
| download | upstream-39a7c8d809e7b8f7c4e554a221776b824277989f.tar.gz upstream-39a7c8d809e7b8f7c4e554a221776b824277989f.tar.bz2 upstream-39a7c8d809e7b8f7c4e554a221776b824277989f.zip | |
generic: 5.15: refresh backport patch
Use 'make target/linux/refresh' to refresh backport patches.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch b/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch index e889a7f5b2..1465d1f35d 100644 --- a/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch +++ b/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch @@ -17,11 +17,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/dsa/qca8k.h | 4 ++++ 2 files changed, 24 insertions(+), 3 deletions(-) -diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c -index d64a9af186beb..bedaaa6b9a1df 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c -@@ -70,6 +70,8 @@ static const struct qca8k_mib_desc ar8327_mib[] = { +@@ -70,6 +70,8 @@ static const struct qca8k_mib_desc ar832 MIB_DESC(1, 0x9c, "TxExcDefer"), MIB_DESC(1, 0xa0, "TxDefer"), MIB_DESC(1, 0xa4, "TxLateCol"), @@ -30,7 +28,7 @@ index d64a9af186beb..bedaaa6b9a1df 100644 }; /* The 32bit switch registers are accessed indirectly. To achieve this we need -@@ -1601,12 +1603,16 @@ qca8k_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, +@@ -1605,12 +1607,16 @@ qca8k_phylink_mac_link_up(struct dsa_swi static void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) { @@ -48,7 +46,7 @@ index d64a9af186beb..bedaaa6b9a1df 100644 strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name, ETH_GSTRING_LEN); } -@@ -1616,12 +1622,15 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, +@@ -1620,12 +1626,15 @@ qca8k_get_ethtool_stats(struct dsa_switc uint64_t *data) { struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; @@ -65,7 +63,7 @@ index d64a9af186beb..bedaaa6b9a1df 100644 mib = &ar8327_mib[i]; reg = QCA8K_PORT_MIB_COUNTER(port) + mib->offset; -@@ -1644,10 +1653,15 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, +@@ -1648,10 +1657,15 @@ qca8k_get_ethtool_stats(struct dsa_switc static int qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset) { @@ -82,7 +80,7 @@ index d64a9af186beb..bedaaa6b9a1df 100644 } static int -@@ -2150,14 +2164,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, +@@ -2154,14 +2168,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, static const struct qca8k_match_data qca8327 = { .id = QCA8K_ID_QCA8327, .reduced_package = true, @@ -100,8 +98,6 @@ index d64a9af186beb..bedaaa6b9a1df 100644 }; static const struct of_device_id qca8k_of_match[] = { -diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h -index 085885275398b..91c94dfc9789d 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -21,6 +21,9 @@ @@ -122,6 +118,3 @@ index 085885275398b..91c94dfc9789d 100644 }; enum { --- -cgit 1.2.3-1.el7 - |