diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-24 22:24:34 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-30 17:41:45 +0200 |
commit | 25fa8919b124f8d7585327988b2a0a4a325e87d6 (patch) | |
tree | fad5ab3a0744958fa1cb3381f139981c90d766f1 /patches/0026-ipv6_stub/cdc_mbim.patch | |
parent | 1cc5efe8e280d78b5552bfee88bdac257151d888 (diff) |
patches: Make patches apply on top of kernel 5.2-rc6
The cordic.c file was moved and the driver from drivers/staging/rtlwifi/
was removed in mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0026-ipv6_stub/cdc_mbim.patch')
-rw-r--r-- | patches/0026-ipv6_stub/cdc_mbim.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/0026-ipv6_stub/cdc_mbim.patch b/patches/0026-ipv6_stub/cdc_mbim.patch index c6abb101..868928bb 100644 --- a/patches/0026-ipv6_stub/cdc_mbim.patch +++ b/patches/0026-ipv6_stub/cdc_mbim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c -@@ -302,6 +302,7 @@ error: +@@ -300,6 +300,7 @@ error: return NULL; } @@ -8,7 +8,7 @@ /* Some devices are known to send Neigbor Solicitation messages and * require Neigbor Advertisement replies. The IPv6 core will not * respond since IFF_NOARP is set, so we must handle them ourselves. -@@ -362,6 +363,7 @@ static bool is_neigh_solicit(u8 *buf, si +@@ -360,6 +361,7 @@ static bool is_neigh_solicit(u8 *buf, si msg->icmph.icmp6_code == 0 && msg->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION); } @@ -16,7 +16,7 @@ static struct sk_buff *cdc_mbim_process_dgram(struct usbnet *dev, u8 *buf, size_t len, u16 tci) -@@ -378,8 +380,10 @@ static struct sk_buff *cdc_mbim_process_ +@@ -376,8 +378,10 @@ static struct sk_buff *cdc_mbim_process_ proto = htons(ETH_P_IP); break; case 0x60: |