diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-17 21:37:24 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-18 21:43:55 +0200 |
commit | fcc5f1904d32847d17c9d7b0f7991b6b84ec754b (patch) | |
tree | 7c9d0e6186dff71b1c8862c64e868aabeb78b14b /patches/collateral-evolutions/network | |
parent | 6e5603fa9e5b0d3c602eb1672473e81a1692f61e (diff) |
backports: refresh on 3.15.1v3.15.1-1
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.60 [ OK ]
4 3.3.8 [ OK ]
5 3.4.93 [ 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.43 [ OK ]
12 3.11.10 [ OK ]
13 3.12.22 [ OK ]
14 3.13.11 [ OK ]
15 3.14.7 [ OK ]
16 3.15.0 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network')
-rw-r--r-- | patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch | 2 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0026-ipv6_stub/cdc_mbim.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch index f6237882..c8dcc3e8 100644 --- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch +++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1160,6 +1160,9 @@ struct ieee80211_local { +@@ -1161,6 +1161,9 @@ struct ieee80211_local { u32 dot11TransmittedFrameCount; #ifdef CONFIG_MAC80211_LEDS diff --git a/patches/collateral-evolutions/network/0026-ipv6_stub/cdc_mbim.patch b/patches/collateral-evolutions/network/0026-ipv6_stub/cdc_mbim.patch index 5c8b62e3..088df4c1 100644 --- a/patches/collateral-evolutions/network/0026-ipv6_stub/cdc_mbim.patch +++ b/patches/collateral-evolutions/network/0026-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: |