From 7793930ad12f67c15bab95fa3cea34345472722f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 7 Sep 2014 12:56:05 +0200 Subject: backports: refresh on v3.14.22 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] Signed-off-by: Hauke Mehrtens --- patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch') diff --git a/patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch b/patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch index 5c8b62e3..088df4c1 100644 --- a/patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch +++ b/patches/collateral-evolutions/network/80-ipv6_stub/cdc_mbim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c -@@ -184,6 +184,7 @@ error: +@@ -201,6 +201,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. -@@ -236,6 +237,7 @@ static bool is_neigh_solicit(u8 *buf, si +@@ -261,6 +262,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) -@@ -252,8 +254,10 @@ static struct sk_buff *cdc_mbim_process_ +@@ -277,8 +279,10 @@ static struct sk_buff *cdc_mbim_process_ proto = htons(ETH_P_IP); break; case 0x60: -- cgit v1.2.3