Skip to content

Commit

Permalink
kernel: bump 5.18 to 5.18.15 (coolsnowwolf#9859)
Browse files Browse the repository at this point in the history
Signed-off-by: aakkll <[email protected]>
  • Loading branch information
aakkll authored Jul 30, 2022
1 parent 25ff31a commit d8e3416
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.18
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.18 = .14
LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
LINUX_VERSION-5.18 = .15
LINUX_KERNEL_HASH-5.18.15 = 69804febdc388a69dfb64493b7b58d402853de3a14144ea8db7fd67c30dcbe3c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}

Expand All @@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
Expand All @@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153_init(struct r8152 *tp)
@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
Expand All @@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153b_init(struct r8152 *tp)
@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
rtl_tally_reset(tp);

tp->coalesce = 15000; /* 15 us */
Expand Down

0 comments on commit d8e3416

Please sign in to comment.